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/cal-dst.el

    r4196 r4204  
    3131;; This collection of functions implements the features of calendar.el and 
    3232;; holiday.el that deal with daylight saving time. 
    33  
    34 ;; Comments, corrections, and improvements should be sent to 
    35 ;;  Edward M. Reingold               Department of Computer Science 
    36 ;;  (217) 333-6733                   University of Illinois at Urbana-Champaign 
    37 ;;  reingold@cs.uiuc.edu             1304 West Springfield Avenue 
    38 ;;                                   Urbana, Illinois 61801 
    3933 
    4034;;; Code: 
    …… 
    267261respectively. This function first attempts to use pre-calculated 
    268262data from `calendar-dst-transition-cache', otherwise it calls 
    269 `calendar-dst-find-data' (and adds the results to the cache)." 
     263`calendar-dst-find-data' (and adds the results to the cache). 
     264If dates in YEAR cannot be handled by `encode-time' (e.g. if they 
     265are too large to be represented as a lisp integer), then rather 
     266than an error this function returns the result appropriate for 
     267the current year." 
    270268  (let ((e (assoc year calendar-dst-transition-cache)) 
    271269        f) 
    272270    (or e 
    273271        (progn 
    274           (setq e (calendar-dst-find-data (encode-time 1 0 0 1 1 year)) 
     272          (setq e (calendar-dst-find-data 
     273                   (condition-case nil 
     274                       (encode-time 1 0 0 1 1 year) 
     275                     (error 
     276                      (encode-time 1 0 0 1 1 (nth 5 (decode-time)))))) 
    275277                f (nth 4 e) 
    276278                e (list year f (nth 5 e))