Mercurial > emacs
changeset 106355:355b68db8800
(window--display-buffer-2): Fix previous changes.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Tue, 01 Dec 2009 17:04:55 +0000 |
| parents | de269b2f72b3 |
| children | 9b7cf86ec483 |
| files | lisp/ChangeLog lisp/window.el |
| diffstat | 2 files changed, 5 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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.
--- 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