From: Glenn Morris Date: Sat, 20 Jul 2013 19:17:32 +0000 (-0700) Subject: * lisp/image-dired.el (image-dired-track-original-file): X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1755^2 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=862f1c9c3a172cd704e286964705b06aaf68b7fa;p=emacs.git * lisp/image-dired.el (image-dired-track-original-file): Avoid changing point of wrong window. Fixes: debbugs:14909 --- 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 + + * image-dired.el (image-dired-track-original-file): + Avoid changing point of wrong window. (Bug#14909) + 2013-07-18 Richard Copley (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 ()