[Emacs-diffs] /srv/bzr/emacs/trunk r111362: Simplify and fix last fix of rmail-maybe-display-summary.

[martin rudalics]

------------------------------------------------------------
revno: 111362
committer: martin rudalics <address@hidden>
branch nick: trunk
timestamp: Fri 2012-12-28 15:35:33 +0100
message:
  Simplify and fix last fix of rmail-maybe-display-summary.
modified:
  lisp/mail/rmail.el

=== modified file 'lisp/mail/rmail.el'
--- a/lisp/mail/rmail.el        2012-12-28 10:24:04 +0000
+++ b/lisp/mail/rmail.el        2012-12-28 14:35:33 +0000
@@ -4224,17 +4224,15 @@
 
 ;; 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))))))
 
 ;;;; *** Rmail Local Fontification ***