1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00

Merge from emacs-24; up to 2012-11-26T19:56:14Z!monnier@iro.umontreal.ca

This commit is contained in:
Glenn Morris 2012-12-09 18:00:42 -08:00
commit 265c2fbf11
21 changed files with 300 additions and 113 deletions

View file

@ -4225,6 +4225,7 @@ This has an effect only if a summary buffer exists."
;; 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)
@ -4246,7 +4247,8 @@ This has an effect only if a summary buffer exists."
(progn
(select-window window)
(enlarge-window (- rmail-summary-window-size (window-height))))
(select-window selected)))))
(select-window selected)
(set-buffer buffer)))))
;;;; *** Rmail Local Fontification ***