diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/calendar/calendar.el | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6622082e5bf..cf5bb68f4d8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2009-10-05 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 2 | |||
| 3 | * calendar/calendar.el (calendar-basic-setup): Don't call | ||
| 4 | switch-to-buffer in a dedicated window. | ||
| 5 | |||
| 1 | 2009-10-05 Karl Fogel <kfogel@red-bean.com> | 6 | 2009-10-05 Karl Fogel <kfogel@red-bean.com> |
| 2 | 7 | ||
| 3 | * bookmark.el (bookmark-handle-bookmark): If bookmark has no file, | 8 | * 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." | |||
| 1321 | (if (window-splittable-p t) (split-window-horizontally)) | 1321 | (if (window-splittable-p t) (split-window-horizontally)) |
| 1322 | (pop-to-buffer calendar-buffer) | 1322 | (pop-to-buffer calendar-buffer) |
| 1323 | ;; Has the window already been split vertically? (See bug#4543) | 1323 | ;; Has the window already been split vertically? (See bug#4543) |
| 1324 | (when (= (window-height) (window-height (frame-root-window))) | 1324 | (when (and (not (window-dedicated-p)) |
| 1325 | (= (window-height) (window-height (frame-root-window)))) | ||
| 1325 | (let ((win (split-window-vertically))) | 1326 | (let ((win (split-window-vertically))) |
| 1326 | ;; Show something else in the upper window. | 1327 | ;; Show something else in the upper window. |
| 1327 | (switch-to-buffer (other-buffer)) | 1328 | (switch-to-buffer (other-buffer)) |