(rmail-summary-goto-msg): Preserve the current buffer.

1 files changed, 5 insertions, 2 deletions

diff --git a/lisp/mail/rmailsum.el b/lisp/mail/rmailsum.el
index 5a009ce55dc..46ea888fe06 100644
--- a/lisp/mail/rmailsum.el
+++ b/lisp/mail/rmailsum.el
@@ -780,7 +780,8 @@ Commands for sorting the summary:
   (if (consp n) (setq n (prefix-numeric-value n)))
   (if (eobp) (forward-line -1))
   (beginning-of-line)
-  (let ((buf rmail-buffer)
+  (let ((obuf (current-buffer))
+        (buf rmail-buffer)
         (cur (point))
         message-not-found
         (curmsg (string-to-int
@@ -832,7 +833,9 @@ Commands for sorting the summary:
         (unwind-protect
             (progn (pop-to-buffer buf)
                    (rmail-show-message n))
-          (select-window selwin))))))
+          (select-window selwin)
+          ;; The actions above can alter the current buffer.  Preserve it.
+          (set-buffer obuf))))))
 
 (defun rmail-summary-scroll-msg-up (&optional dist)
   "Scroll the Rmail window forward."