Make mail exit more nicely when Rmail is in use.

This commit is contained in:
Richard M. Stallman 2011-06-22 19:39:29 -04:00
parent 7a70468fb1
commit 50718fc219
2 changed files with 14 additions and 3 deletions

View file

@ -1,5 +1,8 @@
2011-06-22 Richard Stallman <rms@gnu.org>
* mail/sendmail.el (mail-bury): If Rmail is in use, return nicely
to Rmail even if not started by a special Rmail command.
* mail/rmailmm.el (rmail-insert-mime-forwarded-message):
Copy the buffer currently showing just one message.

View file

@ -806,10 +806,18 @@ Prefix arg means don't delete this window."
(defun mail-bury (&optional arg)
"Bury this mail buffer."
(let ((newbuf (other-buffer (current-buffer))))
(let ((newbuf (other-buffer (current-buffer)))
(return-action mail-return-action)
some-rmail)
(bury-buffer (current-buffer))
(if (and (null arg) mail-return-action)
(apply (car mail-return-action) (cdr mail-return-action))
;; If there is an Rmail buffer, return to it nicely
;; even if this message was not started by an Rmail command.
(unless return-action
(dolist (buffer (buffer-list))
(if (eq (buffer-local-value 'major-mode buffer) 'rmail-mode)
(setq return-action `(rmail-mail-return ,newbuf)))))
(if (and (null arg) return-action)
(apply (car return-action) (cdr return-action))
(switch-to-buffer newbuf))))
(defcustom mail-send-hook nil