diff lisp/buffer.el @ 412:697ef44129c6 r21-2-14

Import from CVS: tag r21-2-14
author cvs
date Mon, 13 Aug 2007 11:20:41 +0200
parents 2f8bb876ab1d
children 95016f13131a
line wrap: on
line diff
--- a/lisp/buffer.el	Mon Aug 13 11:19:22 2007 +0200
+++ b/lisp/buffer.el	Mon Aug 13 11:20:41 2007 +0200
@@ -60,7 +60,11 @@
 	    (set-buffer-major-mode buf))))
     (push-window-configuration)
     (set-buffer buf)
-    (set-window-buffer (last-nonminibuf-window) buf norecord)
+    (or norecord (record-buffer buf))
+    (set-window-buffer (if (eq (selected-window) (minibuffer-window))
+			   (next-window (minibuffer-window))
+			 (selected-window))
+		       buf)
     buf))
 
 (defun pop-to-buffer (bufname &optional not-this-window-p on-frame)