X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fbuffer.el;h=983a55e85bcd1fafc95166174f2c3629ed26793e;hb=ef3d34d0bb421ec7d4def9ca2fadc1f0c5273bca;hp=c8292845f71166004069b6e0ab64e77763a3cb44;hpb=ea1ea793fe6e244ef5555ed983423a204101af13;p=chise%2Fxemacs-chise.git.1

diff --git a/lisp/buffer.el b/lisp/buffer.el
index c829284..983a55e 100644
--- a/lisp/buffer.el
+++ b/lisp/buffer.el
@@ -60,11 +60,7 @@ the window-buffer correspondences."
 	    (set-buffer-major-mode buf))))
     (push-window-configuration)
     (set-buffer buf)
-    (or norecord (record-buffer buf))
-    (set-window-buffer (if (eq (selected-window) (minibuffer-window))
-			   (next-window (minibuffer-window))
-			 (selected-window))
-		       buf)
+    (set-window-buffer (last-nonminibuf-window) buf norecord)
     buf))
 
 (defun pop-to-buffer (bufname &optional not-this-window-p on-frame)