aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorEli Zaretskii2004-04-24 16:36:15 +0000
committerEli Zaretskii2004-04-24 16:36:15 +0000
commit6f60853a511cc75d822fcf1cdf24e70e23d9bc5f (patch)
tree47c136d8b52268518ea63398bb5d3c2742ddb5ea /lisp
parent8a60950d6ee97101f282989169ba3972c7cb487d (diff)
downloademacs-6f60853a511cc75d822fcf1cdf24e70e23d9bc5f.tar.gz
emacs-6f60853a511cc75d822fcf1cdf24e70e23d9bc5f.zip
(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.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/mail/sendmail.el7
2 files changed, 10 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b9f49fb54be..1b1e433ddf0 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
12004-04-24 Eli Zaretskii <eliz@gnu.org> 12004-04-24 Eli Zaretskii <eliz@gnu.org>
2 2
3 * mail/sendmail.el (mail-bury): Don't delete the frame where the
4 mail was being composed if the terminal cannot display more than
5 one frame; instead, switch to previous frame.
6
3 * mail/rmail.el (rmail-mail-new-frame): Doc fix. 7 * mail/rmail.el (rmail-mail-new-frame): Doc fix.
4 (rmail-start-mail): Support rmail-mail-new-frame even on 8 (rmail-start-mail): Support rmail-mail-new-frame even on
5 terminals that can display only one frame at a time. 9 terminals that can display only one frame at a time.
diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index 932f52204c5..d5a85741371 100644
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -714,7 +714,12 @@ Prefix arg means don't delete this window."
714 (if (and (or (window-dedicated-p (frame-selected-window)) 714 (if (and (or (window-dedicated-p (frame-selected-window))
715 (cdr (assq 'mail-dedicated-frame (frame-parameters)))) 715 (cdr (assq 'mail-dedicated-frame (frame-parameters))))
716 (not (null (delq (selected-frame) (visible-frame-list))))) 716 (not (null (delq (selected-frame) (visible-frame-list)))))
717 (delete-frame (selected-frame)) 717 (progn
718 (if (display-multi-frame-p)
719 (delete-frame (selected-frame))
720 ;; The previous frame is where normally they have the
721 ;; RMAIL buffer displayed.
722 (other-frame -1)))
718 (let (rmail-flag summary-buffer) 723 (let (rmail-flag summary-buffer)
719 (and (not arg) 724 (and (not arg)
720 (not (one-window-p)) 725 (not (one-window-p))