[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-24 r111388: * lisp/image-dired.el (image-dired-track
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] emacs-24 r111388: * lisp/image-dired.el (image-dired-track-original-file): |
Date: |
Sat, 20 Jul 2013 19:17:40 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 111388
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/14909
committer: Glenn Morris <address@hidden>
branch nick: emacs-24
timestamp: Sat 2013-07-20 12:17:32 -0700
message:
* lisp/image-dired.el (image-dired-track-original-file):
Avoid changing point of wrong window.
modified:
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/image-dired.el
imagedired.el-20091113204419-o5vbwnq5f7feedwu-4485
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2013-07-18 16:56:08 +0000
+++ b/lisp/ChangeLog 2013-07-20 19:17:32 +0000
@@ -1,3 +1,8 @@
+2013-07-20 Glenn Morris <address@hidden>
+
+ * image-dired.el (image-dired-track-original-file):
+ Avoid changing point of wrong window. (Bug#14909)
+
2013-07-18 Richard Copley <address@hidden> (tiny change)
* progmodes/gdb-mi.el (gdb-done-or-error):
=== modified file 'lisp/image-dired.el'
--- a/lisp/image-dired.el 2013-01-01 09:11:05 +0000
+++ b/lisp/image-dired.el 2013-07-20 19:17:32 +0000
@@ -1035,15 +1035,15 @@
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 ()
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-24 r111388: * lisp/image-dired.el (image-dired-track-original-file):,
Glenn Morris <=