* lisp/image-dired.el (image-dired-track-original-file):

Avoid changing point of wrong window.

Fixes: debbugs:14909

2 files changed, 9 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 71a23f1a822..5cb6371c082 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-07-20  Glenn Morris  <rgm@gnu.org>
+
+        * image-dired.el (image-dired-track-original-file):
+        Avoid changing point of wrong window.  (Bug#14909)
+
 2013-07-18  Richard Copley  <rcopley@gmail.com>  (tiny change)
 
         * progmodes/gdb-mi.el (gdb-done-or-error):
diff --git a/lisp/image-dired.el b/lisp/image-dired.el
index f0483e6217a..d101fc63da0 100644
--- a/lisp/image-dired.el
+++ b/lisp/image-dired.el
@@ -1035,15 +1035,15 @@ With prefix argument ARG, remove tag from file at point."
 See documentation for `image-dired-toggle-movement-tracking'.
 Interactive use only useful if `image-dired-track-movement' is nil."
   (interactive)
-  (let ((old-buf (current-buffer))
+  (let* ((old-buf (current-buffer))
         (dired-buf (image-dired-associated-dired-buffer))
-        (file-name (image-dired-original-file-name)))
+         (file-name (image-dired-original-file-name))
+         (window (image-dired-get-buffer-window dired-buf)))
     (when (and (buffer-live-p dired-buf) file-name)
       (set-buffer dired-buf)
       (if (not (dired-goto-file file-name))
           (message "Could not track file")
-        (set-window-point
-         (image-dired-get-buffer-window dired-buf) (point)))
+        (if window (set-window-point window (point))))
       (set-buffer old-buf))))
 
 (defun image-dired-toggle-movement-tracking ()