[Emacs-diffs] emacs/lisp ChangeLog calendar/calendar.el

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        09/10/05 05:36:15

Modified files:
        lisp           : ChangeLog 
        lisp/calendar  : calendar.el 

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

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16357&r2=1.16358
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/calendar/calendar.el?cvsroot=emacs&r1=1.286&r2=1.287

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16357
retrieving revision 1.16358
diff -u -b -r1.16357 -r1.16358
--- ChangeLog   5 Oct 2009 04:19:05 -0000       1.16357
+++ ChangeLog   5 Oct 2009 05:36:11 -0000       1.16358
@@ -1,3 +1,8 @@
+2009-10-05  Stefan Monnier  <address@hidden>
+
+       * calendar/calendar.el (calendar-basic-setup): Don't call
+       switch-to-buffer in a dedicated window.
+
 2009-10-05  Karl Fogel  <address@hidden>
 
        * bookmark.el (bookmark-handle-bookmark): If bookmark has no file,

Index: calendar/calendar.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/calendar/calendar.el,v
retrieving revision 1.286
retrieving revision 1.287
diff -u -b -r1.286 -r1.287
--- calendar/calendar.el        3 Oct 2009 02:19:25 -0000       1.286
+++ calendar/calendar.el        5 Oct 2009 05:36:15 -0000       1.287
@@ -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))