(calendar-basic-setup): Don't call switch-to-buffer in a dedicated window.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6622082e5bf59ae278af8510eb39baa678955396..cf5bb68f4d8800619271a9088cc3a77c9bd75f28 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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,

diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el
index 4c033dd8917b226bc2c05cf062d0c7cf05c2db25..90e0acc2eecfe66cde38d38eb9e105f0cdfe1b1f 100644 (file)
--- 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))