(add-change-log-entry): Avoid displaying the changelog a second time.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 907292a0c2d18654cb7bec283a637c41867431c9..4580dcd49c27b792d7990adba0c807c2fa0c0c6e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2009-11-13  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+       * add-log.el (add-change-log-entry): Avoid displaying the changelog
+       a second time.
+
        * x-dnd.el (x-dnd-maybe-call-test-function):
        * window.el (split-window-vertically):
        * whitespace.el (whitespace-help-on):

diff --git a/lisp/add-log.el b/lisp/add-log.el
index c3e8364f1f199100f1894d1f4473a6be639b39be..1633a6441d7ae326b2fe738ccf865e87e1b633a9 100644 (file)
--- a/lisp/add-log.el
+++ b/lisp/add-log.el
@@ -807,9 +807,15 @@ non-nil, otherwise in local time."
         (item (add-log-file-name buffer-file file-name)))
 
     (unless (equal file-name buffer-file-name)
-      (if (or other-window (window-dedicated-p (selected-window)))
-         (find-file-other-window file-name)
-       (find-file file-name)))
+      (cond
+       ((equal file-name (buffer-file-name (window-buffer (selected-window))))
+        ;; If the selected window already shows the desired buffer don't show
+        ;; it again (particularly important if other-window is true).
+        ;; This is important for diff-add-change-log-entries-other-window.
+        (set-buffer (window-buffer (selected-window))))
+       ((or other-window (window-dedicated-p (selected-window)))
+        (find-file-other-window file-name))
+       (t (find-file file-name))))
     (or (derived-mode-p 'change-log-mode)
        (change-log-mode))
     (undo-boundary)