Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 803-813)

   - Update from CVS
   - Merge from emacs--rel--22

 * emacs--rel--22  (patch 51-58)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 233-236)

   - Merge from emacs--devo--0
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-25

1 files changed, 17 insertions, 19 deletions

diff --git a/lisp/log-edit.el b/lisp/log-edit.el
index 8f63635ee49..b59a6a61a9b 100644
--- a/lisp/log-edit.el
+++ b/lisp/log-edit.el
@@ -590,25 +590,23 @@ The return value looks like this:
   (LOGBUFFER (ENTRYSTART . ENTRYEND) ...)
 where LOGBUFFER is the name of the ChangeLog buffer, and each
 \(ENTRYSTART . ENTRYEND\) pair is a buffer region."
-  (save-excursion
-    (let ((changelog-file-name
-	   (let ((default-directory
-		   (file-name-directory (expand-file-name file)))
-		 (visiting-buffer (find-buffer-visiting file)))
-	     ;; If there is a buffer visiting FILE, and it has a local
-	     ;; value for `change-log-default-name', use that.
-	     (if (and visiting-buffer
-		      (local-variable-p 'change-log-default-name
-					visiting-buffer))
-		 (save-excursion
-		   (set-buffer visiting-buffer)
-		   change-log-default-name)
-	       ;; `find-change-log' uses `change-log-default-name' if set
-	       ;; and sets it before exiting, so we need to work around
-	       ;; that memoizing which is undesired here
-	       (setq change-log-default-name nil)
-	       (find-change-log)))))
-      (set-buffer (find-file-noselect changelog-file-name))
+  (let ((changelog-file-name
+         (let ((default-directory
+                 (file-name-directory (expand-file-name file)))
+               (visiting-buffer (find-buffer-visiting file)))
+           ;; If there is a buffer visiting FILE, and it has a local
+           ;; value for `change-log-default-name', use that.
+           (if (and visiting-buffer
+                    (local-variable-p 'change-log-default-name
+                                      visiting-buffer))
+               (with-current-buffer visiting-buffer
+                 change-log-default-name)
+             ;; `find-change-log' uses `change-log-default-name' if set
+             ;; and sets it before exiting, so we need to work around
+             ;; that memoizing which is undesired here
+             (setq change-log-default-name nil)
+             (find-change-log)))))
+    (with-current-buffer (find-file-noselect changelog-file-name)
       (unless (eq major-mode 'change-log-mode) (change-log-mode))
       (goto-char (point-min))
       (if (looking-at "\\s-*\n") (goto-char (match-end 0)))