aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTassilo Horn2013-05-06 22:39:36 +0000
committerKatsumi Yamaoka2013-05-06 22:39:36 +0000
commit06a73f4edb8c762cba618cadb0cc8f962a3fb53e (patch)
treeebe0ffb2ee7a277a10bce973776883772a708628
parentee6cff992302d80b9cbb0889725066c485dbf265 (diff)
downloademacs-06a73f4edb8c762cba618cadb0cc8f962a3fb53e.tar.gz
emacs-06a73f4edb8c762cba618cadb0cc8f962a3fb53e.zip
lisp/gnus/message.el (message-bury, message-send-and-exit): Revert 2013-05-04 change
-rw-r--r--lisp/gnus/ChangeLog5
-rw-r--r--lisp/gnus/message.el4
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 49826f0e939..2701a666598 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
12013-05-06 Tassilo Horn <tassilo@member.fsf.org>
2
3 * message.el (message-bury, message-send-and-exit):
4 Revert 2013-05-04 change.
5
12013-05-06 Glenn Morris <rgm@gnu.org> 62013-05-06 Glenn Morris <rgm@gnu.org>
2 7
3 * mml2015.el (mml2015-epg-sign): Add name="signature.asc". (Bug#13465) 8 * mml2015.el (mml2015-epg-sign): Add name="signature.asc". (Bug#13465)
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index ad077b4da23..a6638097b47 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -4047,7 +4047,7 @@ It should typically alter the sending method in some way or other."
4047 (actions message-exit-actions)) 4047 (actions message-exit-actions))
4048 (when (and (message-send arg) 4048 (when (and (message-send arg)
4049 (buffer-name buf)) 4049 (buffer-name buf))
4050 (message-bury) 4050 (message-bury buf)
4051 (if message-kill-buffer-on-exit 4051 (if message-kill-buffer-on-exit
4052 (kill-buffer buf)) 4052 (kill-buffer buf))
4053 (message-do-actions actions) 4053 (message-do-actions actions)
@@ -4095,7 +4095,7 @@ Instead, just auto-save the buffer and then bury it."
4095 (message-disassociate-draft))) 4095 (message-disassociate-draft)))
4096 (message-do-actions actions)))) 4096 (message-do-actions actions))))
4097 4097
4098(defun message-bury (&optional buffer) 4098(defun message-bury (buffer)
4099 "Bury this mail BUFFER." 4099 "Bury this mail BUFFER."
4100 (if message-return-action 4100 (if message-return-action
4101 (progn 4101 (progn