(mail-bury): If showing rmail buffer that has summary, show the summary too.

diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index 422a42d2bf8e13729db9132cba68f19268085750..473504e2e3b0edf526c0529b1f01e0bbd494713a 100644 (file)
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -324,13 +324,22 @@ Prefix arg means don't delete this window."
             (cdr (assq 'dedicated (frame-parameters)))
             (not (null (delq (selected-frame) (visible-frame-list)))))
        (delete-frame (selected-frame))
-      (if (and (not arg)
-              (not (one-window-p))
-              (save-excursion
-                (set-buffer (window-buffer (next-window (selected-window) 'not)))
-                (eq major-mode 'rmail-mode)))
-         (delete-window)
-       (switch-to-buffer newbuf)))))
+      (let (rmail-flag summary-buffer)
+       (and (not arg)
+            (not (one-window-p))
+            (save-excursion
+              (set-buffer (window-buffer (next-window (selected-window) 'not)))
+              (setq rmail-flag (eq major-mode 'rmail-mode))
+              (setq summary-buffer
+                    (and rmail-summary-buffer
+                         (buffer-name rmail-summary-buffer)
+                         (not (get-buffer-window rmail-summary-buffer))
+                         rmail-summary-buffer))))
+       (if rmail-flag
+           ;; If the Rmail buffer has a summary, show that.
+           (if summary-buffer (switch-to-buffer summary-buffer)
+             (delete-window))
+         (switch-to-buffer newbuf))))))
 
 (defun mail-send ()
   "Send the message in the current buffer.