# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1259687095 0
# Node ID 355b68db8800f7a2ddbd9bc74631336c454850df
# Parent  de269b2f72b38657e6466003c42a2dfae7340430
(window--display-buffer-2): Fix previous changes.

diff -r de269b2f72b3 -r 355b68db8800 lisp/ChangeLog
--- a/lisp/ChangeLog	Tue Dec 01 16:21:36 2009 +0000
+++ b/lisp/ChangeLog	Tue Dec 01 17:04:55 2009 +0000
@@ -1,3 +1,7 @@
+2009-12-01  Glenn Morris  <rgm@gnu.org>
+
+	* window.el (window--display-buffer-2): Fix previous changes.
+
 2009-12-01  Chong Yidong  <cyd@stupidchicken.com>
 
 	* mail/sendmail.el (mail-setup-hook, mail-send-hook): Doc fixes.
diff -r de269b2f72b3 -r 355b68db8800 lisp/window.el
--- a/lisp/window.el	Tue Dec 01 16:21:36 2009 +0000
+++ b/lisp/window.el	Tue Dec 01 17:04:55 2009 +0000
@@ -1036,8 +1036,6 @@
       (raise-frame frame))
     window))
 
-(defvar window-to-use)           ; dynamically bound in display-buffer
-
 (defun window--display-buffer-2 (buffer window &optional dedicated)
   "Display BUFFER in WINDOW and make its frame visible.
 Set `window-dedicated-p' to DEDICATED if non-nil.
@@ -1045,7 +1043,7 @@
   (when (and (buffer-live-p buffer) (window-live-p window))
     (set-window-buffer window buffer)
     (when dedicated
-      (set-window-dedicated-p window-to-use dedicated))
+      (set-window-dedicated-p window dedicated))
     (window--display-buffer-1 window)))
 
 (defvar display-buffer-mark-dedicated nil