2 files changed, 7 insertions, 2 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 590277e89cd..f767ee4407b 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,7 @@
+2011-11-30  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * message.el (message-pop-to-buffer): Revert 2011-09-11 change.
+
 2011-11-30  Katsumi Yamaoka  <yamaoka@jpl.org>
 
         * gnus-art.el (gnus-article-browse-html-parts): Convert link file names
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 5d82faee20d..eea50de4cec 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -6322,6 +6322,7 @@ between beginning of field and beginning of line."
 
 (defun message-pop-to-buffer (name &optional switch-function)
   "Pop to buffer NAME, and warn if it already exists and is modified."
+  (unless switch-function (setq switch-function #'pop-to-buffer))
   (let ((buffer (get-buffer name)))
     (if (and buffer
              (buffer-name buffer))
@@ -6331,7 +6332,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 'switch-to-buffer) buffer)
+            (funcall switch-function buffer)
             (set-buffer buffer))
           (when (and (buffer-modified-p)
                      (not (prog1
@@ -6339,7 +6340,7 @@ between beginning of field and beginning of line."
                                "Message already being composed; erase? ")
                             (message nil))))
             (error "Message being composed")))
-      (funcall (or switch-function 'switch-to-buffer) name)
+      (funcall switch-function name)
       (set-buffer name))
     (erase-buffer)
     (message-mode)))