Fix incorrect args to display-buffer-reuse-window in 2011-07-09T12:32…

…:38Z!rudalics@gmx.at.

* lisp/window.el (display-buffer): Fix arguments to
display-buffer-reuse-window in last change.

lisp/ChangeLog

@@ -1,3 +1,8 @@
+2011-07-10  Chong Yidong  <cyd@stupidchicken.com>
+
+	* window.el (display-buffer): Fix arguments to
+	display-buffer-reuse-window in last change.
+
 2011-07-09  Bob Nnamtrop  <bobnnamtrop@gmail.com>  (tiny change)
 
 	* emulation/viper-cmd.el (viper-change-state-to-vi): Limit

lisp/window.el

@@ -5737,19 +5737,19 @@ this list as arguments."
       (or (and (window-live-p window) window)
 	  ;; on the selected frame,
 	  (display-buffer-reuse-window
-	   buffer '(nil nil nil) other-window)
+	   buffer '(nil nil nil) nil other-window)
 	  ;; showing BUFFER on any visible frame,
 	  (display-buffer-reuse-window
-	   buffer '(nil same visible) other-window)
+	   buffer '(nil same visible) nil other-window)
 	  ;; not showing BUFFER on any visible frame,
 	  (display-buffer-reuse-window
-	   buffer '(nil other visible) other-window)
+	   buffer '(nil other visible) nil other-window)
 	  ;; showing BUFFER on any visible or iconified frame,
 	  (display-buffer-reuse-window
-	   buffer '(nil same 0) other-window)
+	   buffer '(nil same 0) nil other-window)
 	  ;; not showing BUFFER on any visible or iconified frame.
 	  (display-buffer-reuse-window
-	   buffer '(nil other 0) other-window)
+	   buffer '(nil other 0) nil other-window)
 	  ;; If everything failed so far, try popping up a new frame
 	  ;; regardless of graphic-only restrictions.
 	  (display-buffer-pop-up-frame buffer)))))