[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100429: Fix gratuitous argument passing error in image-dired (Bug#7817).

[Chong Yidong]

------------------------------------------------------------
revno: 100429
committer: Chong Yidong <address@hidden>
branch nick: emacs-23
timestamp: Fri 2011-01-28 13:09:59 -0500
message:
  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.
modified:
  lisp/ChangeLog
  lisp/image-dired.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-01-28 17:18:54 +0000
+++ b/lisp/ChangeLog    2011-01-28 18:09:59 +0000
@@ -1,5 +1,8 @@
 2011-01-28  Chong Yidong  <address@hidden>
 
+       * 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  <address@hidden>

=== modified file 'lisp/image-dired.el'
--- a/lisp/image-dired.el       2011-01-02 23:50:46 +0000
+++ b/lisp/image-dired.el       2011-01-28 18:09:59 +0000
@@ -2187,15 +2187,15 @@
 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.