From 6fc0aac3632372ac488ccdd269fdf86c53701f28 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Fri, 28 Jan 2011 13:09:59 -0500 Subject: [PATCH] Fix gratuitous argument passing error in image-dired (Bug#7817). * lisp/image-dired.el (image-dired-mouse-display-image): No-op if no file is found. --- lisp/ChangeLog | 3 +++ lisp/image-dired.el | 18 +++++++++--------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c35e3db23e6..d71c51f5bde 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2011-01-28 Chong Yidong + * image-dired.el (image-dired-mouse-display-image): No-op if no + file is found (Bug#7817). + * mouse.el (mouse-menu-non-singleton): Doc fix (Bug#7801). 2011-01-28 Kenichi Handa diff --git a/lisp/image-dired.el b/lisp/image-dired.el index 41fee0b0df2..489195837fc 100644 --- a/lisp/image-dired.el +++ b/lisp/image-dired.el @@ -2187,15 +2187,15 @@ matching tag will be marked in the dired buffer." Track this in associated dired buffer if `image-dired-track-movement' is non-nil." (interactive "e") - (let (file) - (mouse-set-point event) - (goto-char (posn-point (event-end event))) - (setq file (image-dired-original-file-name)) - (if image-dired-track-movement - (image-dired-track-original-file)) - (image-dired-create-display-image-buffer) - (display-buffer image-dired-display-image-buffer) - (image-dired-display-image file))) + (mouse-set-point event) + (goto-char (posn-point (event-end event))) + (let ((file (image-dired-original-file-name))) + (when file + (if image-dired-track-movement + (image-dired-track-original-file)) + (image-dired-create-display-image-buffer) + (display-buffer image-dired-display-image-buffer) + (image-dired-display-image file)))) (defun image-dired-mouse-select-thumbnail (event) "Use mouse EVENT to select thumbnail image. -- 2.11.4.GIT