From 665addc97b7d74ac2456ec14448bc1c3f3d21471 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Thu, 10 Feb 2011 14:35:35 -0500 Subject: [PATCH] * lisp/gnus/message.el (message-bury): Don't pop up a new window when selected window is dedicated. --- lisp/gnus/ChangeLog | 13 +++++++++---- lisp/gnus/message.el | 10 +++++----- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index ba4d270951b..7f362030586 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,8 @@ +2011-02-10 Stefan Monnier + + * message.el (message-bury): Don't pop up a new window when selected + window is dedicated. + 2011-02-09 Lars Ingebrigtsen * 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 - * 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 diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el index e30f7f2c973..42b61950986 100644 --- a/lisp/gnus/message.el +++ b/lisp/gnus/message.el @@ -4011,11 +4011,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.