From: Glenn Morris <rgm@gnu.org>
Date: Fri, 26 Apr 2013 07:59:32 +0000 (-0700)
Subject: * lisp/gnus/message.el (message-bury): Revert 2013-03-18 change.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~2026^2~364
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=967f2fbb34913c250fc10160953338037b18ac7b;p=emacs.git

* 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 251e5b1f381..1384df85ca3 100644
--- 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 2b2a0a94413..a6638097b47 100644
--- 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.