message.el (message-bury): Don't pop up a new window when selected window is dedicated.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 02ddfe1..82454fa 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-10  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * message.el (message-bury): Don't pop up a new window when selected
+       window is dedicated.
+
 2011-02-10  Antoine Levitt  <antoine.levitt@gmail.com>  (tiny change)
 
        * gnus-sum.el (gnus-summary-save-parts): Use read-directory-name.

diff --git a/lisp/message.el b/lisp/message.el
index fe05bd1..bfe07e6 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -4055,11 +4055,11 @@ Instead, just auto-save the buffer and then bury it."
 
 (defun message-bury (buffer)
   "Bury this mail BUFFER."
-  (let ((newbuf (other-buffer buffer)))
-    (bury-buffer buffer)
-    (if message-return-action
-       (apply (car message-return-action) (cdr message-return-action))
-      (switch-to-buffer newbuf))))
+  (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.