auto upstream

2 files changed, 12 insertions, 21 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e13ce397bee..1083dc5513d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-28  Martin Rudalics  <rudalics@gmx.at>
+
+        * mail/rmail.el (rmail-maybe-display-summary): Rewrite
+        (Bug#13066).
+
 2012-12-28  Andreas Schwab  <schwab@linux-m68k.org>
 
         * epg.el (epg--start): Modify process-environment locally.
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 9c48788553b..dbda8a6e26d 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -4224,31 +4224,17 @@ 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)
+  (let (window size)
     ;; If requested, make sure the summary is displayed.
     (and rmail-summary-buffer (buffer-name rmail-summary-buffer)
          rmail-redisplay-summary
-         (if (get-buffer-window rmail-summary-buffer 0)
-             ;; It's already in some frame; show that one.
-             (let ((frame (window-frame
-                           (get-buffer-window rmail-summary-buffer 0))))
-               (make-frame-visible frame)
-               (raise-frame frame))
-           (display-buffer rmail-summary-buffer)))
-    ;; If requested, set the height of the summary window.
-    (and rmail-summary-buffer (buffer-name rmail-summary-buffer)
+         (setq window
+               (display-buffer
+                rmail-summary-buffer '(nil (reusable-frames . visible))))
          rmail-summary-window-size
-         (setq window (get-buffer-window rmail-summary-buffer))
-         ;; Don't try to change the size if just one window in frame.
-         (not (eq window (frame-root-window (window-frame window))))
-         (unwind-protect
-             (progn
-               (select-window window)
-               (enlarge-window (- rmail-summary-window-size (window-height))))
-           (select-window selected)
-           (set-buffer buffer)))))
+         (setq size (- rmail-summary-window-size (window-height window)))
+         (window--resizable-p window size)
+         (window-resize window size))))
 
 ;;;; *** Rmail Local Fontification ***