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)))