* message.el (message-pop-to-buffer): Partially revert 2011-11-30 change (Bug#10200).

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index fbfcda57b53d6f08019a2968fd1cbeee30725fcf..1f2b5c9d1cf9dbed4cb9b93bb36b54cfeffd9b44 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2011-12-04  Chong Yidong  <cyd@gnu.org>
+
+       * message.el (message-pop-to-buffer): Partially revert 2011-11-30
+       change (Bug#10200).
+
 2011-12-02  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * compface.el (uncompface):

diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index ee9d4992158393c2f8303506efed41fca1cbaa72..d75f85a897a597c4aa5318daea8a720b1730393c 100644 (file)
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -6327,7 +6327,6 @@ 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))
@@ -6337,7 +6336,7 @@ between beginning of field and beginning of line."
              (progn
                (gnus-select-frame-set-input-focus (window-frame window))
                (select-window window))
-           (funcall switch-function buffer)
+           (funcall (or switch-function #'pop-to-buffer) buffer)
            (set-buffer buffer))
          (when (and (buffer-modified-p)
                     (not (prog1
@@ -6345,7 +6344,7 @@ between beginning of field and beginning of line."
                               "Message already being composed; erase? ")
                            (message nil))))
            (error "Message being composed")))
-      (funcall switch-function name)
+      (funcall (or switch-function #'switch-to-buffer) name)
       (set-buffer name))
     (erase-buffer)
     (message-mode)))