[Emacs-diffs] /srv/bzr/emacs/trunk r106633: message.el (message-pop-to-buffer): Use pop-to-buffer instead of pop-to-buffer-same-window for old Emacsen.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 106633
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Wed 2011-12-07 06:07:53 +0000
message:
  message.el (message-pop-to-buffer): Use pop-to-buffer instead of 
pop-to-buffer-same-window for old Emacsen.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/message.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2011-12-04 08:02:42 +0000
+++ b/lisp/gnus/ChangeLog       2011-12-07 06:07:53 +0000
@@ -1,3 +1,8 @@
+2011-12-07  Katsumi Yamaoka  <address@hidden>
+
+       * 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  <address@hidden>
 
        * message.el (message-pop-to-buffer): Partially revert 2011-11-30

=== modified file 'lisp/gnus/message.el'
--- a/lisp/gnus/message.el      2011-12-04 08:02:42 +0000
+++ b/lisp/gnus/message.el      2011-12-07 06:07:53 +0000
@@ -6344,7 +6344,11 @@
                               "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)))