From: Ken Olum <kdo@cosmos.phy.tufts.edu>
Date: Thu, 9 Jan 2014 20:01:15 +0000 (-0500)
Subject: Tiny change for message-bury
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2^2~26
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6affdccc5895a0e9650d74c93e0ef04a3e38d41f;p=emacs.git

Tiny change for message-bury

Ref: http://lists.gnu.org/archive/html/emacs-devel/2014-01/msg00539.html

* lisp/gnus/message.el (message-bury): Call bury-buffer with no
argument in the message-return-action case too.
---

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index bcf26ac9f9c..8f2dc713376 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2014-01-09  Ken Olum <kdo@cosmos.phy.tufts.edu>  (tiny change)
+
+	* message.el (message-bury): Call bury-buffer with no argument
+	in the message-return-action case too.
+
 2014-01-05  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* gnus-sum.el (gnus-article-stop-animations): Declare it before using.
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index d1a32d52e06..f6830c13072 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -4099,11 +4099,9 @@ Instead, just auto-save the buffer and then bury it."
 
 (defun message-bury (buffer)
   "Bury this mail BUFFER."
+  (with-current-buffer buffer (bury-buffer))
   (if message-return-action
-      (progn
-        (bury-buffer buffer)
-        (apply (car message-return-action) (cdr message-return-action)))
-    (with-current-buffer buffer (bury-buffer))))
+      (apply (car message-return-action) (cdr message-return-action))))
 
 (defun message-send (&optional arg)
   "Send the message in the current buffer.