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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 36c9137..1cff54e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/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/message.el b/lisp/message.el
index 1b82ad5..d87879b 100644 (file)
--- 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."
-  (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.