message.el (message-bury): Minor cleanup

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e94f2e1..7b64cec 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2013-03-18  Sam Steingold  <sds@gnu.org>
+
+       * message.el (message-bury): Minor cleanup.
+
 2013-03-07  Paul Eggert  <eggert@cs.ucla.edu>
 
        * gnus-cite.el: Specify utf-8, not iso-8859-1, for ASCII file.

diff --git a/lisp/message.el b/lisp/message.el
index d87879b..1b82ad5 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -4141,11 +4141,9 @@ Instead, just auto-save the buffer and then bury it."
 
 (defun message-bury (buffer)
   "Bury this mail BUFFER."
-  (if message-return-action
-      (progn
-        (bury-buffer buffer)
-        (apply (car message-return-action) (cdr message-return-action)))
-    (with-current-buffer buffer (bury-buffer))))
+  (bury-buffer buffer)
+  (when message-return-action
+    (apply (car message-return-action) (cdr message-return-action))))
 
 (defun message-send (&optional arg)
   "Send the message in the current buffer.