[gnus git] branch master updated: m0-5-305-g0ab87d9 =1= message.el (message-bury): Revert 2013-03-18 change (Bug#14117)

       via  0ab87d91235597c14500e98b3b3d38e1004ed304 (commit)
      from  f950cc759a3eb86f83503da090230d4646b83764 (commit)


- Log -----------------------------------------------------------------
commit 0ab87d91235597c14500e98b3b3d38e1004ed304
Author: Glenn Morris <[email protected]>
Date:   Fri Apr 26 10:15:04 2013 +0000

    message.el (message-bury): Revert 2013-03-18 change (Bug#14117)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 36c9137..1cff54e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2013-04-26  Glenn Morris  <[email protected]>
+
+	* message.el (message-bury): Revert 2013-03-18 change.  (Bug#14117)
+
 2013-04-25  Andrew Cohen  <[email protected]>
 
 	* gnus-msg.el (gnus-inews-insert-gcc): Re-order conditional to work for
diff --git a/lisp/message.el b/lisp/message.el
index 1b82ad5..d87879b 100644
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -4141,9 +4141,11 @@ Instead, just auto-save the buffer and then bury it."
 
 (defun message-bury (buffer)
   "Bury this mail BUFFER."
+  (if message-return-action
+      (progn
   (bury-buffer buffer)
-  (when message-return-action
-    (apply (car message-return-action) (cdr message-return-action))))
+        (apply (car message-return-action) (cdr message-return-action)))
+    (with-current-buffer buffer (bury-buffer))))
 
 (defun message-send (&optional arg)
   "Send the message in the current buffer.

-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.

Summary of changes:
 lisp/ChangeLog  |    4 ++++
 lisp/message.el |    8 +++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".

The branch, master has been updated


hooks/post-receive
-- 
Gnus Project