# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1258152856 0
# Node ID d90116e2656a0dbcf5a8b55e9c31c0eb44114876
# Parent  009383a57ce803cb05648147666fc34579d8786c
(add-change-log-entry): Avoid displaying the changelog a second time.

diff -r 009383a57ce8 -r d90116e2656a lisp/ChangeLog
--- a/lisp/ChangeLog	Fri Nov 13 22:19:45 2009 +0000
+++ b/lisp/ChangeLog	Fri Nov 13 22:54:16 2009 +0000
@@ -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 -r 009383a57ce8 -r d90116e2656a lisp/add-log.el
--- a/lisp/add-log.el	Fri Nov 13 22:19:45 2009 +0000
+++ b/lisp/add-log.el	Fri Nov 13 22:54:16 2009 +0000
@@ -807,9 +807,15 @@
 	 (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)