diff options
| author | Martin Rudalics <rudalics@gmx.at> | 2012-12-31 12:35:13 +0100 |
|---|---|---|
| committer | Martin Rudalics <rudalics@gmx.at> | 2012-12-31 12:35:13 +0100 |
| commit | 27fcfe31010c45f2e87ce51fa2fe99183731e261 (patch) | |
| tree | 7f0a28c296ea2132a8d0cf6ac675277a9d05ddbb /lisp/mail | |
| parent | 393e7ee04463305dfbd0027e3e7c72fc80888186 (diff) | |
| download | emacs-27fcfe31010c45f2e87ce51fa2fe99183731e261.tar.gz | |
Once more fix resizing of rmail summary window.
* window.el (window-resizable--p): Rename to window-resizable-p.
(window-resize-no-error): New function.
* mail/rmail.el (rmail-maybe-display-summary): Restore behavior
broken in fix from 2012-12-28.
Diffstat (limited to 'lisp/mail')
| -rw-r--r-- | lisp/mail/rmail.el | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el index 096b53c6cab..947d8e2cb4c 100644 --- a/lisp/mail/rmail.el +++ b/lisp/mail/rmail.el @@ -4224,15 +4224,25 @@ 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 () - ;; If requested, make sure the summary is displayed. - (when (and rmail-summary-buffer (buffer-name rmail-summary-buffer) - rmail-redisplay-summary) + (cond + ((or (not rmail-summary-buffer) + (not (buffer-name rmail-summary-buffer)))) + (rmail-redisplay-summary + ;; If `rmail-redisplay-summary' is non-nil, make sure the summary + ;; buffer is displayed. (display-buffer rmail-summary-buffer `(nil (reusable-frames . 0) ,(when rmail-summary-window-size - `(window-height . ,rmail-summary-window-size)))))) + `(window-height . ,rmail-summary-window-size))))) + (rmail-summary-window-size + ;; If `rmail-summary-window-size' is non-nil and the summary buffer + ;; is displayed, make sure it gets resized. + (let ((window (get-buffer-window rmail-summary-buffer 0))) + (when window + (window-resize-no-error + window (- rmail-summary-window-size (window-height window)))))))) ;;;; *** Rmail Local Fontification *** |