diff options
Diffstat (limited to 'lisp/gnus')
| -rw-r--r-- | lisp/gnus/ChangeLog | 8 | ||||
| -rw-r--r-- | lisp/gnus/message.el | 36 |
2 files changed, 18 insertions, 26 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 4911f243343..b1fcb5429d6 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,11 @@ +2011-09-11 Chong Yidong <cyd@stupidchicken.com> + + * message.el (message-pop-to-buffer): Default to switch-to-buffer. + (message-mail-other-window, message-mail-other-frame) + (message-news-other-window, message-news-other-frame): Use + switch-to-buffer-other-frame and switch-to-buffer-other-window instead + of setting buffer display varibles. + 2011-09-11 Lars Magne Ingebrigtsen <larsi@gnus.org> * gnus-dup.el (gnus-dup-suppress-articles): Move "Suppressing diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el index 194ebf81873..f78e2b0339d 100644 --- a/lisp/gnus/message.el +++ b/lisp/gnus/message.el @@ -6329,7 +6329,7 @@ between beginning of field and beginning of line." (progn (gnus-select-frame-set-input-focus (window-frame window)) (select-window window)) - (funcall (or switch-function 'pop-to-buffer) buffer) + (funcall (or switch-function 'switch-to-buffer) buffer) (set-buffer buffer)) (when (and (buffer-modified-p) (not (prog1 @@ -6337,7 +6337,7 @@ between beginning of field and beginning of line." "Message already being composed; erase? ") (message nil)))) (error "Message being composed"))) - (funcall (or switch-function 'pop-to-buffer) name) + (funcall (or switch-function 'switch-to-buffer) name) (set-buffer name)) (erase-buffer) (message-mode))) @@ -7619,12 +7619,8 @@ you." "Like `message-mail' command, but display mail buffer in another window." (interactive) (unless (message-mail-user-agent) - (let ((pop-up-windows t) - (special-display-buffer-names nil) - (special-display-regexps nil) - (same-window-buffer-names nil) - (same-window-regexps nil)) - (message-pop-to-buffer (message-buffer-name "mail" to)))) + (message-pop-to-buffer (message-buffer-name "mail" to) + 'switch-to-buffer-other-window)) (let ((message-this-is-mail t)) (message-setup `((To . ,(or to "")) (Subject . ,(or subject ""))) nil nil nil 'switch-to-buffer-other-window))) @@ -7634,12 +7630,8 @@ you." "Like `message-mail' command, but display mail buffer in another frame." (interactive) (unless (message-mail-user-agent) - (let ((pop-up-frames t) - (special-display-buffer-names nil) - (special-display-regexps nil) - (same-window-buffer-names nil) - (same-window-regexps nil)) - (message-pop-to-buffer (message-buffer-name "mail" to)))) + (message-pop-to-buffer (message-buffer-name "mail" to) + 'switch-to-buffer-other-frame)) (let ((message-this-is-mail t)) (message-setup `((To . ,(or to "")) (Subject . ,(or subject ""))) nil nil nil 'switch-to-buffer-other-frame))) @@ -7648,12 +7640,8 @@ you." (defun message-news-other-window (&optional newsgroups subject) "Start editing a news article to be sent." (interactive) - (let ((pop-up-windows t) - (special-display-buffer-names nil) - (special-display-regexps nil) - (same-window-buffer-names nil) - (same-window-regexps nil)) - (message-pop-to-buffer (message-buffer-name "posting" nil newsgroups))) + (message-pop-to-buffer (message-buffer-name "posting" nil newsgroups) + 'switch-to-buffer-other-window) (let ((message-this-is-news t)) (message-setup `((Newsgroups . ,(or newsgroups "")) (Subject . ,(or subject "")))))) @@ -7662,12 +7650,8 @@ you." (defun message-news-other-frame (&optional newsgroups subject) "Start editing a news article to be sent." (interactive) - (let ((pop-up-frames t) - (special-display-buffer-names nil) - (special-display-regexps nil) - (same-window-buffer-names nil) - (same-window-regexps nil)) - (message-pop-to-buffer (message-buffer-name "posting" nil newsgroups))) + (message-pop-to-buffer (message-buffer-name "posting" nil newsgroups) + 'switch-to-buffer-other-frame) (let ((message-this-is-news t)) (message-setup `((Newsgroups . ,(or newsgroups "")) (Subject . ,(or subject "")))))) |