mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-03-07 06:22:32 -08:00
Code Issues Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Stefan Monnier 2009-10-05 05:36:11 +00:00
parent 5feb1ba7e5
commit 72aa7df48f
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -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,

3
lisp/calendar/calendar.el
View file

@ -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))