From: Stefan Monnier Date: Mon, 5 Oct 2009 05:36:11 +0000 (+0000) Subject: (calendar-basic-setup): Don't call switch-to-buffer in a dedicated window. X-Git-Tag: emacs-pretest-23.1.90~931 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=72aa7df48fecec7cc22b91f4a2997828b0cd8c3a;p=emacs.git (calendar-basic-setup): Don't call switch-to-buffer in a dedicated window. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6622082e5bf..cf5bb68f4d8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2009-10-05 Stefan Monnier + + * calendar/calendar.el (calendar-basic-setup): Don't call + switch-to-buffer in a dedicated window. + 2009-10-05 Karl Fogel * bookmark.el (bookmark-handle-bookmark): If bookmark has no file, diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el index 4c033dd8917..90e0acc2eec 100644 --- a/lisp/calendar/calendar.el +++ b/lisp/calendar/calendar.el @@ -1321,7 +1321,8 @@ display the generated calendar." (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))