[Emacs-diffs] /srv/bzr/emacs/trunk r112391: * lisp/gnus/message.el (message-bury): Revert 2013-03-18 change.

[Glenn Morris]

------------------------------------------------------------
revno: 112391
fixes bug: http://debbugs.gnu.org/14117
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Fri 2013-04-26 00:59:32 -0700
message:
  * lisp/gnus/message.el (message-bury): Revert 2013-03-18 change.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/message.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2013-04-26 02:08:43 +0000
+++ b/lisp/gnus/ChangeLog       2013-04-26 07:59:32 +0000
@@ -1,3 +1,7 @@
+2013-04-26  Glenn Morris  <address@hidden>
+
+       * message.el (message-bury): Revert 2013-03-18 change.  (Bug#14117)
+
 2013-04-25  Andrew Cohen  <address@hidden>
 
        * gnus-msg.el (gnus-inews-insert-gcc): Re-order conditional to work for

=== modified file 'lisp/gnus/message.el'
--- a/lisp/gnus/message.el      2013-03-18 17:25:15 +0000
+++ b/lisp/gnus/message.el      2013-04-26 07:59:32 +0000
@@ -4097,9 +4097,11 @@
 
 (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.