[Emacs-diffs] /srv/bzr/emacs/trunk r106598: * message.el (message-pop-to-buffer): Partially revert 2011-11-30 change (Bug#10200).

[Chong Yidong]

------------------------------------------------------------
revno: 106598
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sun 2011-12-04 09:55:49 +0800
message:
  * message.el (message-pop-to-buffer): Partially revert 2011-11-30 change 
(Bug#10200).
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/message.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2011-12-02 04:00:32 +0000
+++ b/lisp/gnus/ChangeLog       2011-12-04 01:55:49 +0000
@@ -1,3 +1,8 @@
+2011-12-04  Chong Yidong  <address@hidden>
+
+       * message.el (message-pop-to-buffer): Partially revert 2011-11-30
+       change (Bug#10200).
+
 2011-12-02  Katsumi Yamaoka  <address@hidden>
 
        * compface.el (uncompface):

=== modified file 'lisp/gnus/message.el'
--- a/lisp/gnus/message.el      2011-12-01 04:55:39 +0000
+++ b/lisp/gnus/message.el      2011-12-04 01:55:49 +0000
@@ -6327,7 +6327,6 @@
 
 (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 @@
              (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 @@
                               "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)))