changeset 106371:089e310803a4

Replace all pop-to-buffer calls with rmail-pop-to-buffer, to prevent horizontal splits.

--- a/lisp/ChangeLog	Wed Dec 02 03:04:43 2009 +0000
+++ b/lisp/ChangeLog	Wed Dec 02 03:05:14 2009 +0000
@@ -2,6 +2,8 @@
 
 	* mail/rmail.el (rmail-pop-to-buffer): New function.  (Bug#2282)
 	(rmail-select-summary): Use rmail-pop-to-buffer.
+	* mail/rmailsum.el: Replace all pop-to-buffer calls with
+	rmail-pop-to-buffer, to prevent horizontal splits.
 
 	* calendar/diary-lib.el (diary-list-entries): Replace superfluous
 	save-excursion with save-current-buffer.

--- a/lisp/mail/rmailsum.el	Wed Dec 02 03:04:43 2009 +0000
+++ b/lisp/mail/rmailsum.el	Wed Dec 02 03:05:14 2009 +0000
@@ -230,13 +230,13 @@
 	  (progn
 	    (split-window (selected-window) rmail-summary-window-size)
 	    (select-window (next-window (frame-first-window)))
-	    (pop-to-buffer rmail-summary-buffer)
+	    (rmail-pop-to-buffer rmail-summary-buffer)
 	    ;; If pop-to-buffer did not use that window, delete that
 	    ;; window.  (This can happen if it uses another frame.)
 	    (if (not (eq rmail-summary-buffer
 			 (window-buffer (frame-first-window))))
 		(delete-other-windows)))
-	(pop-to-buffer rmail-summary-buffer))
+	(rmail-pop-to-buffer rmail-summary-buffer))
       (set-buffer rmail-buffer)
       ;; This is how rmail makes the summary buffer reappear.
       ;; We do this here to make the window the proper size.
@@ -796,12 +796,12 @@
 	     (rmail-summary-goto-msg)
 	     (if rmail-enable-mime
 		 (set-buffer rmail-buffer)
-	       (pop-to-buffer rmail-buffer))
+	       (rmail-pop-to-buffer rmail-buffer))
 	     (and (rmail-message-deleted-p rmail-current-message)
 		  (rmail-undelete-previous-message))
 	     (if rmail-enable-mime
-		 (pop-to-buffer rmail-buffer))
-	     (pop-to-buffer rmail-summary-buffer))
+		 (rmail-pop-to-buffer rmail-buffer))
+	     (rmail-pop-to-buffer rmail-summary-buffer))
 	    (t (goto-char opoint))))))
 
 (defun rmail-summary-undelete-many (&optional n)
@@ -1234,7 +1234,7 @@
     (unless skip-rmail
       (let ((selwin (selected-window)))
 	(unwind-protect
-	    (progn (pop-to-buffer buf)
+	    (progn (rmail-pop-to-buffer buf)
 		   (rmail-show-message n))
 	  (select-window selwin)
 	  ;; The actions above can alter the current buffer.  Preserve it.
@@ -1333,12 +1333,12 @@
       (let ((buffer rmail-buffer))
 	(split-window (selected-window) rmail-summary-window-size)
 	(select-window (frame-first-window))
-	(pop-to-buffer rmail-buffer)
+	(rmail-pop-to-buffer rmail-buffer)
 	;; If pop-to-buffer did not use that window, delete that
 	;; window.  (This can happen if it uses another frame.)
 	(or (eq buffer (window-buffer (next-window (frame-first-window))))
 	    (delete-other-windows)))
-    (pop-to-buffer rmail-buffer))
+    (rmail-pop-to-buffer rmail-buffer))
   (cond
    ((eq where 'BEG)
 	(goto-char (point-min))
@@ -1347,7 +1347,7 @@
 	(goto-char (point-max))
 	(recenter (1- (window-height))))
    )
-  (pop-to-buffer rmail-summary-buffer))
+  (rmail-pop-to-buffer rmail-summary-buffer))
 
 (defun rmail-summary-bury ()
   "Bury the Rmail buffer and the Rmail summary buffer."
@@ -1376,7 +1376,7 @@
     (if (not (eq (selected-window) (next-window nil 'no-minibuf)))
 	(delete-window))
     ;; Switch windows to the rmail buffer, or switch to it in this window.
-    (pop-to-buffer local-rmail-buffer)))
+    (rmail-pop-to-buffer local-rmail-buffer)))
 
 (defun rmail-summary-expunge ()
   "Actually erase all deleted messages and recompute summary headers."
@@ -1417,7 +1417,7 @@
   "Run Rmail on file FILENAME."
   (interactive "FRun rmail on RMAIL file: ")
   ;; We switch windows here, then display the other Rmail file there.
-  (pop-to-buffer rmail-buffer)
+  (rmail-pop-to-buffer rmail-buffer)
   (rmail filename))
 
 (defun rmail-summary-first-message ()
@@ -1450,7 +1450,7 @@
 (defun rmail-summary-edit-current-message ()
   "Edit the contents of this message."
   (interactive)
-  (pop-to-buffer rmail-buffer)
+  (rmail-pop-to-buffer rmail-buffer)
   (rmail-edit-current-message)
   (use-local-map rmail-summary-edit-map))
 
@@ -1458,14 +1458,14 @@
   "Finish editing message, then go back to Rmail summary buffer."
   (interactive)
   (rmail-cease-edit)
-  (pop-to-buffer rmail-summary-buffer))
+  (rmail-pop-to-buffer rmail-summary-buffer))
 
 (defun rmail-summary-abort-edit ()
   "Abort edit of current message; restore original contents.
 Go back to summary buffer."
   (interactive)
   (rmail-abort-edit)
-  (pop-to-buffer rmail-summary-buffer))
+  (rmail-pop-to-buffer rmail-summary-buffer))
 
 (defun rmail-summary-search-backward (regexp &optional n)
   "Show message containing next match for REGEXP.
@@ -1524,7 +1524,7 @@
 	(selwin (selected-window)))
     (unwind-protect
 	(progn
-	  (pop-to-buffer rmail-buffer)
+	  (rmail-pop-to-buffer rmail-buffer)
 	  (rmail-search regexp n))
       (select-window selwin)
       (set-buffer buffer))))
@@ -1826,7 +1826,7 @@
   (require 'rmailsort)
   (let ((selwin (selected-window)))
     (unwind-protect
-	(progn (pop-to-buffer rmail-buffer)
+	(progn (rmail-pop-to-buffer rmail-buffer)
 	       (funcall sortfun reverse))
       (select-window selwin))))