Permalink
Browse files

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

  • Loading branch information...
1 parent ee5fc60 commit 1532e14b5b5e42a90c8e38d2da43c5e453fb8bd3 @rgmorris rgmorris committed Dec 1, 2009
Showing with 5 additions and 3 deletions.
  1. +4 −0 lisp/ChangeLog
  2. +1 −3 lisp/window.el
View
4 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.
View
4 lisp/window.el
@@ -1036,16 +1036,14 @@ 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.
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

0 comments on commit 1532e14

Please sign in to comment.