Simplify and fix last fix of rmail-maybe-display-summary.

diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index dbda8a6e26db1e85653b357c8ea143e1746457f9..ec35cc59b2666f328c3158399540dd2a93e247ea 100644 (file)
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -4224,17 +4224,15 @@ 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 (window size)
-    ;; If requested, make sure the summary is displayed.
-    (and rmail-summary-buffer (buffer-name rmail-summary-buffer)
-        rmail-redisplay-summary
-        (setq window
-              (display-buffer
-               rmail-summary-buffer '(nil (reusable-frames . visible))))
-        rmail-summary-window-size
-        (setq size (- rmail-summary-window-size (window-height window)))
-        (window--resizable-p window size)
-        (window-resize window size))))
+  ;; If requested, make sure the summary is displayed.
+  (when (and rmail-summary-buffer (buffer-name rmail-summary-buffer)
+            rmail-redisplay-summary)
+    (display-buffer
+     rmail-summary-buffer
+     `(nil
+       (reusable-frames . 0)
+       ,(when rmail-summary-window-size
+         `(window-height . ,rmail-summary-window-size))))))
 \f
 ;;;; *** Rmail Local Fontification ***