From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Wed, 30 Nov 2011 22:06:08 +0000 (+0000)
Subject: message.el (message-pop-to-buffer): Revert 2011-09-11 change.
X-Git-Url: https://cgit.sxemacs.org/?a=commitdiff_plain;ds=sidebyside;h=07f959536376e60fdd78137bfabb935433a9a7a2;p=gnus

message.el (message-pop-to-buffer): Revert 2011-09-11 change.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 631e9ba00..e4b442340 100644
--- a/lisp/ChangeLog
+++ b/lisp/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/message.el b/lisp/message.el
index 5ce99077a..e0a8f20c6 100644
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -6366,6 +6366,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))
@@ -6375,7 +6376,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
@@ -6383,7 +6384,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)))