[Emacs-diffs] /srv/bzr/emacs/trunk r103214: * lisp/gnus/message.el (message-bury): Don't pop up a new window when selected

[Stefan Monnier]

------------------------------------------------------------
revno: 103214
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Thu 2011-02-10 14:35:35 -0500
message:
  * lisp/gnus/message.el (message-bury): Don't pop up a new window when selected
  window is dedicated.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/message.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2011-02-09 22:16:29 +0000
+++ b/lisp/gnus/ChangeLog       2011-02-10 19:35:35 +0000
@@ -1,3 +1,8 @@
+2011-02-10  Stefan Monnier  <address@hidden>
+
+       * message.el (message-bury): Don't pop up a new window when selected
+       window is dedicated.
+
 2011-02-09  Lars Ingebrigtsen  <address@hidden>
 
        * nntp.el (nntp-retrieve-group-data-early-disabled): Disable the async
@@ -22,7 +27,7 @@
        (nnimap-update-info): Clean up slightly.
        (nnimap-quirk): Add quirk for Gmail IMAP which bugs out on NUL
        characters.
-       (nnimap-process-quirk): Renamed function to avoid collision.
+       (nnimap-process-quirk): Rename function to avoid collision.
        (nnimap-update-info): Fix macrology bug-out.
        (nnimap-update-info): Simplify split history test.
 
@@ -43,7 +48,7 @@
        * message.el (message-setup-1): Remove the read-only stuff, since it
        doesn't work under XEmacs, for some reason.
 
-       * gnus-sum.el (gnus-user-date): Renamed back from
+       * gnus-sum.el (gnus-user-date): Rename back from
        gnus-summary-user-date since user code refers to it.
 
        * shr.el (shr-render-td): Store the actual background colour used.
@@ -228,8 +233,8 @@
 
 2011-01-28  Daiki Ueno  <address@hidden>
 
-       * mml2015.el (mml2015-epg-sign, mml2015-epg-encrypt): Give
-       mml2015-signers higher precedence over mml2015-sign-with-sender.
+       * mml2015.el (mml2015-epg-sign, mml2015-epg-encrypt):
+       Give mml2015-signers higher precedence over mml2015-sign-with-sender.
 
 2011-01-27  Lars Ingebrigtsen  <address@hidden>
 

=== modified file 'lisp/gnus/message.el'
--- a/lisp/gnus/message.el      2011-02-09 22:16:29 +0000
+++ b/lisp/gnus/message.el      2011-02-10 19:35:35 +0000
@@ -4011,11 +4011,11 @@
 
 (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.