Mercurial > emacs
changeset 105450:7e96a7ac3ac0
(calendar-basic-setup): Don't call switch-to-buffer in a dedicated window.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Mon, 05 Oct 2009 05:36:11 +0000 |
| parents | 4d75e3e0f1ea |
| children | 816590cee63a |
| files | lisp/ChangeLog lisp/calendar/calendar.el |
| diffstat | 2 files changed, 7 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Mon Oct 05 04:19:04 2009 +0000 +++ b/lisp/ChangeLog Mon Oct 05 05:36:11 2009 +0000 @@ -1,3 +1,8 @@ +2009-10-05 Stefan Monnier <monnier@iro.umontreal.ca> + + * calendar/calendar.el (calendar-basic-setup): Don't call + switch-to-buffer in a dedicated window. + 2009-10-05 Karl Fogel <kfogel@red-bean.com> * bookmark.el (bookmark-handle-bookmark): If bookmark has no file,
--- a/lisp/calendar/calendar.el Mon Oct 05 04:19:04 2009 +0000 +++ b/lisp/calendar/calendar.el Mon Oct 05 05:36:11 2009 +0000 @@ -1321,7 +1321,8 @@ (if (window-splittable-p t) (split-window-horizontally)) (pop-to-buffer calendar-buffer) ;; Has the window already been split vertically? (See bug#4543) - (when (= (window-height) (window-height (frame-root-window))) + (when (and (not (window-dedicated-p)) + (= (window-height) (window-height (frame-root-window)))) (let ((win (split-window-vertically))) ;; Show something else in the upper window. (switch-to-buffer (other-buffer))