[Emacs-diffs] /srv/bzr/emacs/trunk r106557: * lisp/gnus/message.el (message-pop-to-buffer): Revert 2011-09-11 change.

[Stefan Monnier]

------------------------------------------------------------
revno: 106557
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Wed 2011-11-30 09:52:08 -0500
message:
  * lisp/gnus/message.el (message-pop-to-buffer): Revert 2011-09-11 change.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/message.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2011-11-30 01:07:46 +0000
+++ b/lisp/gnus/ChangeLog       2011-11-30 14:52:08 +0000
@@ -1,3 +1,7 @@
+2011-11-30  Stefan Monnier  <address@hidden>
+
+       * message.el (message-pop-to-buffer): Revert 2011-09-11 change.
+
 2011-11-30  Katsumi Yamaoka  <address@hidden>
 
        * gnus-art.el (gnus-article-browse-html-parts): Convert link file names

=== modified file 'lisp/gnus/message.el'
--- a/lisp/gnus/message.el      2011-11-20 07:30:16 +0000
+++ b/lisp/gnus/message.el      2011-11-30 14:52:08 +0000
@@ -6322,6 +6322,7 @@
 
 (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 @@
              (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 @@
                               "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)))