diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2009-11-13 22:54:16 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2009-11-13 22:54:16 +0000 |
| commit | d499c5b950a2aa8d6af470e672821f927d6e50c5 (patch) | |
| tree | 4d05e4181cb508fa4fcb9c8c9e8767c2a1fa63b9 | |
| parent | 7fdbcd83877ab0317df43e1120c583af3ba86bc4 (diff) | |
(add-change-log-entry): Avoid displaying the changelog a second time.
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/add-log.el | 12 |
2 files changed, 12 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 907292a0c2..4580dcd49c 100644 --- 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 c3e8364f1f..1633a6441d 100644 --- 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) |