[Emacs-diffs] /srv/bzr/emacs/emacs-24 r111002: Further rmail.el fix for bug#13066

[Glenn Morris]

------------------------------------------------------------
revno: 111002
committer: Glenn Morris <address@hidden>
branch nick: emacs-24
timestamp: Thu 2012-12-06 16:41:32 -0500
message:
  Further rmail.el fix for bug#13066
  
  * lisp/mail/rmail.el (rmail-maybe-display-summary):
  Preserve buffer, in case select-window changes it.
modified:
  lisp/ChangeLog
  lisp/mail/rmail.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-12-06 21:08:50 +0000
+++ b/lisp/ChangeLog    2012-12-06 21:41:32 +0000
@@ -1,3 +1,8 @@
+2012-12-06  Glenn Morris  <address@hidden>
+
+       * mail/rmail.el (rmail-maybe-display-summary):
+       Preserve buffer, in case select-window changes it.  (Bug#13066)
+
 2012-12-06  Stefan Monnier  <address@hidden>
 
        * emacs-lisp/cl.el, emacs-lisp/cl-lib.el: Move cl-unload-function and

=== modified file 'lisp/mail/rmail.el'
--- a/lisp/mail/rmail.el        2012-12-05 12:20:55 +0000
+++ b/lisp/mail/rmail.el        2012-12-06 21:41:32 +0000
@@ -4194,6 +4194,7 @@
 ;; Put the summary buffer back on the screen, if user wants that.
 (defun rmail-maybe-display-summary ()
   (let ((selected (selected-window))
+       (buffer (current-buffer))
        window)
     ;; If requested, make sure the summary is displayed.
     (and rmail-summary-buffer (buffer-name rmail-summary-buffer)
@@ -4215,7 +4216,8 @@
             (progn
               (select-window window)
               (enlarge-window (- rmail-summary-window-size (window-height))))
-          (select-window selected)))))
+          (select-window selected)
+          (set-buffer buffer)))))
 
 ;;;; *** Rmail Local Fontification ***