(mail-bury): Don't delete the frame where the

mail was being composed if the terminal cannot display more than
one frame; instead, switch to previous frame.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b9f49fb54be0fa714842ad05e2c650330aac00aa..1b1e433ddf0faf8dc92eac39d466998cb4cfb4db 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2004-04-24  Eli Zaretskii  <eliz@gnu.org>
 
+       * mail/sendmail.el (mail-bury): Don't delete the frame where the
+       mail was being composed if the terminal cannot display more than
+       one frame; instead, switch to previous frame.
+
        * mail/rmail.el (rmail-mail-new-frame): Doc fix.
        (rmail-start-mail): Support rmail-mail-new-frame even on
        terminals that can display only one frame at a time.

diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index 932f52204c59ce2609b96da962e41ca72d56ebe3..d5a85741371989ce452e4880ee90d0d1707264d2 100644 (file)
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -714,7 +714,12 @@ Prefix arg means don't delete this window."
     (if (and (or (window-dedicated-p (frame-selected-window))
                 (cdr (assq 'mail-dedicated-frame (frame-parameters))))
             (not (null (delq (selected-frame) (visible-frame-list)))))
-       (delete-frame (selected-frame))
+       (progn
+         (if (display-multi-frame-p)
+             (delete-frame (selected-frame))
+           ;; The previous frame is where normally they have the
+           ;; RMAIL buffer displayed.
+           (other-frame -1)))
       (let (rmail-flag summary-buffer)
        (and (not arg)
             (not (one-window-p))