[Emacs-diffs] emacs/lisp ChangeLog window.el

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       09/12/01 17:04:59

Modified files:
        lisp           : ChangeLog window.el 

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

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16784&r2=1.16785
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/window.el?cvsroot=emacs&r1=1.191&r2=1.192

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16784
retrieving revision 1.16785
diff -u -b -r1.16784 -r1.16785
--- ChangeLog   1 Dec 2009 16:20:59 -0000       1.16784
+++ ChangeLog   1 Dec 2009 17:04:55 -0000       1.16785
@@ -1,3 +1,7 @@
+2009-12-01  Glenn Morris  <address@hidden>
+
+       * window.el (window--display-buffer-2): Fix previous changes.
+
 2009-12-01  Chong Yidong  <address@hidden>
 
        * mail/sendmail.el (mail-setup-hook, mail-send-hook): Doc fixes.

Index: window.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/window.el,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -b -r1.191 -r1.192
--- window.el   1 Dec 2009 03:15:05 -0000       1.191
+++ window.el   1 Dec 2009 17:04:58 -0000       1.192
@@ -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