From: Glenn Morris <rgm@gnu.org>
Date: Tue, 1 Dec 2009 17:04:55 +0000 (+0000)
Subject: (window--display-buffer-2): Fix previous changes.
X-Git-Tag: emacs-pretest-23.1.90~138
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=782d6e3016389ce2018c12d8fa047a8b6d5f8a5c;p=emacs.git

(window--display-buffer-2): Fix previous changes.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7b6d96a142d..202770d96af 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/lisp/window.el b/lisp/window.el
index 09e8097cef1..a1ba8500ee5 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -1036,8 +1036,6 @@ Do not raise the selected frame.  Return WINDOW."
       (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 @@ Return WINDOW."
   (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