diff options
| author | Chong Yidong | 2011-01-28 13:09:59 -0500 |
|---|---|---|
| committer | Chong Yidong | 2011-01-28 13:09:59 -0500 |
| commit | 6fc0aac3632372ac488ccdd269fdf86c53701f28 (patch) | |
| tree | 4050090a93f434649759667493cc33f06d049a69 | |
| parent | 65401ee3fefe38cb3a8a350a17f8b0a3a4ccb579 (diff) | |
| download | emacs-6fc0aac3632372ac488ccdd269fdf86c53701f28.tar.gz emacs-6fc0aac3632372ac488ccdd269fdf86c53701f28.zip | |
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.
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | 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 @@ | |||
| 1 | 2011-01-28 Chong Yidong <cyd@stupidchicken.com> | 1 | 2011-01-28 Chong Yidong <cyd@stupidchicken.com> |
| 2 | 2 | ||
| 3 | * image-dired.el (image-dired-mouse-display-image): No-op if no | ||
| 4 | file is found (Bug#7817). | ||
| 5 | |||
| 3 | * mouse.el (mouse-menu-non-singleton): Doc fix (Bug#7801). | 6 | * mouse.el (mouse-menu-non-singleton): Doc fix (Bug#7801). |
| 4 | 7 | ||
| 5 | 2011-01-28 Kenichi Handa <handa@m17n.org> | 8 | 2011-01-28 Kenichi Handa <handa@m17n.org> |
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." | |||
| 2187 | Track this in associated dired buffer if `image-dired-track-movement' is | 2187 | Track this in associated dired buffer if `image-dired-track-movement' is |
| 2188 | non-nil." | 2188 | non-nil." |
| 2189 | (interactive "e") | 2189 | (interactive "e") |
| 2190 | (let (file) | 2190 | (mouse-set-point event) |
| 2191 | (mouse-set-point event) | 2191 | (goto-char (posn-point (event-end event))) |
| 2192 | (goto-char (posn-point (event-end event))) | 2192 | (let ((file (image-dired-original-file-name))) |
| 2193 | (setq file (image-dired-original-file-name)) | 2193 | (when file |
| 2194 | (if image-dired-track-movement | 2194 | (if image-dired-track-movement |
| 2195 | (image-dired-track-original-file)) | 2195 | (image-dired-track-original-file)) |
| 2196 | (image-dired-create-display-image-buffer) | 2196 | (image-dired-create-display-image-buffer) |
| 2197 | (display-buffer image-dired-display-image-buffer) | 2197 | (display-buffer image-dired-display-image-buffer) |
| 2198 | (image-dired-display-image file))) | 2198 | (image-dired-display-image file)))) |
| 2199 | 2199 | ||
| 2200 | (defun image-dired-mouse-select-thumbnail (event) | 2200 | (defun image-dired-mouse-select-thumbnail (event) |
| 2201 | "Use mouse EVENT to select thumbnail image. | 2201 | "Use mouse EVENT to select thumbnail image. |