Show
Ignore:
Timestamp:
05/01/07 18:04:59 (2 years ago)
Author:
miyoshi
Message:

Sync up with Emacs_22_BASE.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/lisp/calendar/appt.el

    r4190 r4204  
    234234  (let ((appt-display-format 
    235235         (if (eq appt-display-format 'ignore) 
    236              (cond (appt-msg-window 'window) 
    237                    (appt-visible 'echo)) 
     236               (cond (appt-msg-window 'window) 
     237                     (appt-visible 'echo)) 
    238238           appt-display-format))) 
    239239    (cond ((eq appt-display-format 'window) 
    …… 
    458458        ;; By default, split the bottom window and use the lower part. 
    459459        (appt-select-lowest-window) 
    460         (select-window (split-window))) 
     460        ;; Split the window, unless it's too small to do so. 
     461        (when (>= (window-height) (* 2 window-min-height)) 
     462          (select-window (split-window)))) 
    461463      (switch-to-buffer appt-disp-buf)) 
    462464    (calendar-set-mode-line