[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r104694: Work with changes in mail-bu
From: |
Richard Stallman |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r104694: Work with changes in mail-bury. |
Date: |
Thu, 23 Jun 2011 13:03:59 -0400 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 104694
committer: Richard Stallman <address@hidden>
branch nick: trunk
timestamp: Thu 2011-06-23 13:03:59 -0400
message:
Work with changes in mail-bury.
modified:
lisp/ChangeLog
lisp/mail/rmail.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2011-06-23 16:55:59 +0000
+++ b/lisp/ChangeLog 2011-06-23 17:03:59 +0000
@@ -7,6 +7,9 @@
* mail/rmail.el (rmail-retry-ignored-headers): Add message-id.
(rmail-show-message-1): Preserve buffer modified flag.
+ (rmail-start-mail): Don't specify use of rmail-mail-return;
+ that's done by mail-bury now.
+ (rmail-mail-return): Handle arg NEWBUF.
2011-06-23 Michael Albinus <address@hidden>
=== modified file 'lisp/mail/rmail.el'
--- a/lisp/mail/rmail.el 2011-06-23 16:38:40 +0000
+++ b/lisp/mail/rmail.el 2011-06-23 17:03:59 +0000
@@ -3458,15 +3458,15 @@
(if (stringp subject) (setq subject (rfc2047-decode-string subject)))
(prog1
(compose-mail to subject other-headers noerase
- switch-function yank-action sendactions
- '(rmail-mail-return))
+ switch-function yank-action sendactions)
(if (eq switch-function 'switch-to-buffer-other-frame)
;; This is not a standard frame parameter; nothing except
;; sendmail.el looks at it.
(modify-frame-parameters (selected-frame)
'((mail-dedicated-frame . t)))))))
-(defun rmail-mail-return ()
+(defun rmail-mail-return (&optional newbuf)
+ "NEWBUF is a buffer to switch to."
(cond
;; If there is only one visible frame with no special handling,
;; consider deleting the mail window to return to Rmail.
@@ -3491,7 +3491,8 @@
(if rmail-flag
;; If the Rmail buffer has a summary, show that.
(if summary-buffer (switch-to-buffer summary-buffer)
- (delete-window)))))
+ (delete-window))
+ (switch-to-buffer newbuf))))
;; If the frame was probably made for this buffer, the user
;; probably wants to delete it now.
((display-multi-frame-p)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r104694: Work with changes in mail-bury.,
Richard Stallman <=