emacs-31 6bd90deb269: ; Fix fallout from 'image-dired-display-image-mode' changes in 2021

branch: emacs-31
commit 6bd90deb269d74f13f6129d2c2ae656cf129b288
Author: Eli Zaretskii <[email protected]>
Commit: Eli Zaretskii <[email protected]>

    ; Fix fallout from 'image-dired-display-image-mode' changes in 2021
    
    * lisp/image/image-dired.el (image-dired-display-this): Make the
    optional argument be ignored, and don't pass it to
    'image-dired-display-image'.  Doc fix.  (Bug#81491)
---
 lisp/image/image-dired.el | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lisp/image/image-dired.el b/lisp/image/image-dired.el
index cba090e7c85..1a8fb1007f4 100644
--- a/lisp/image/image-dired.el
+++ b/lisp/image/image-dired.el
@@ -1296,10 +1296,10 @@ which is based on `image-mode'."
     (when buf (pop-to-buffer buf))
     (select-window cur-win)))
 
-(defun image-dired-display-this (&optional arg)
+(defun image-dired-display-this (&optional _ignore)
   "Display current thumbnail's original image in display buffer.
-See documentation for `image-dired-display-image' for more information.
-With prefix argument ARG, display image in its original size."
+See documentation for `image-dired-display-image' for more information."
+  (declare (advertised-calling-convention () "29.1"))
   (interactive "P" image-dired-thumbnail-mode)
   (unless (string-equal major-mode "image-dired-thumbnail-mode")
     (user-error "Not in `image-dired-thumbnail-mode'"))
@@ -1309,7 +1309,7 @@ With prefix argument ARG, display image in its original size."
           ((not file)
            (message "No original file name found"))
           (t
-           (image-dired-display-image file arg)))))
+           (image-dired-display-image file)))))
 
 (defun image-dired-display-next (&optional arg)
   "Move to the next image in the thumbnail buffer and display it.