summaryrefslogtreecommitdiff
path: root/lisp/gnus
diff options
context:
space:
mode:
authorKatsumi Yamaoka <yamaoka@jpl.org>2011-12-07 06:07:53 +0000
committerKatsumi Yamaoka <yamaoka@jpl.org>2011-12-07 06:07:53 +0000
commit1ea1c2fa5ffe544ddd96565e0958f12e8698136b (patch)
tree9b8a82f2980bd701a39196cf26da76d5ce293323 /lisp/gnus
parent7efa6272f0cc8a3ef6d925c42a5cc09a2165baef (diff)
downloademacs-1ea1c2fa5ffe544ddd96565e0958f12e8698136b.tar.gz
message.el (message-pop-to-buffer): Use pop-to-buffer instead of pop-to-buffer-same-window for old Emacsen.
Diffstat (limited to 'lisp/gnus')
-rw-r--r--lisp/gnus/ChangeLog5
-rw-r--r--lisp/gnus/message.el6
2 files changed, 10 insertions, 1 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 1f46887f00f..bdc7313e57a 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2011-12-07 Katsumi Yamaoka <yamaoka@jpl.org>
+
+ * message.el (message-pop-to-buffer): Use pop-to-buffer instead of
+ pop-to-buffer-same-window for old Emacsen.
+
2011-12-04 Chong Yidong <cyd@gnu.org>
* message.el (message-pop-to-buffer): Partially revert 2011-11-30
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 8ecbd22fc0d..b127160dfc4 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -6344,7 +6344,11 @@ 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-same-window) name)
+ (funcall (or switch-function
+ (if (fboundp #'pop-to-buffer-same-window)
+ #'pop-to-buffer-same-window
+ #'pop-to-buffer))
+ name)
(set-buffer name))
(erase-buffer)
(message-mode)))