* lisp/gnus/message.el (message-bury): Revert 2013-03-18 change.

Fixes: debbugs:14117

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 251e5b1f381a33986968754378558f2aea3a85fe..1384df85ca377192e288ac9639ab9a8a6afc254f 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,7 @@
+2013-04-26  Glenn Morris  <rgm@gnu.org>
+
+       * message.el (message-bury): Revert 2013-03-18 change.  (Bug#14117)
+
 2013-04-25  Andrew Cohen  <cohen@bu.edu>
 
        * gnus-msg.el (gnus-inews-insert-gcc): Re-order conditional to work for

diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 2b2a0a944132d28775fc1b55b6d85c837c2b690a..a6638097b4747be3f34643f22e6137a3d4c47dc1 100644 (file)
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -4097,9 +4097,11 @@ Instead, just auto-save the buffer and then bury it."
 
 (defun message-bury (buffer)
   "Bury this mail BUFFER."
-  (bury-buffer buffer)
-  (when message-return-action
-    (apply (car message-return-action) (cdr message-return-action))))
+  (if message-return-action
+      (progn
+        (bury-buffer buffer)
+        (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.