Show
Ignore:
Timestamp:
04/07/07 15:49:28 (2 years ago)
Author:
miyoshi
Message:

Sync up with Emacs CVS HEAD.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/lisp/emacs-lisp/timer.el

    r4190 r4200  
    361361  "Perform an action at time TIME. 
    362362Repeat the action every REPEAT seconds, if REPEAT is non-nil. 
    363 TIME should be a string like \"11:23pm\", nil meaning now, a number of seconds 
    364 from now, a value from `current-time', or t (with non-nil REPEAT) 
    365 meaning the next integral multiple of REPEAT. 
    366 REPEAT may be an integer or floating point number. 
    367 The action is to call FUNCTION with arguments ARGS. 
     363TIME should be one of: a string giving an absolute time like 
     364\"11:23pm\" (the acceptable formats are those recognized by 
     365`diary-entry-time'; note that such times are interpreted as times 
     366today, even if in the past); a string giving a relative time like 
     367\"2 hours 35 minutes\" (the acceptable formats are those 
     368recognized by `timer-duration'); nil meaning now; a number of 
     369seconds from now; a value from `encode-time'; or t (with non-nil 
     370REPEAT) meaning the next integral multiple of REPEAT.  REPEAT may 
     371be an integer or floating point number.  The action is to call 
     372FUNCTION with arguments ARGS. 
    368373 
    369374This function returns a timer object which you can use in `cancel-timer'." 
    …… 
    386391      (setq time (timer-relative-time (current-time) time))) 
    387392 
    388   ;; Handle relative times like "2 hours and 35 minutes" 
     393  ;; Handle relative times like "2 hours 35 minutes" 
    389394  (if (stringp time) 
    390395      (let ((secs (timer-duration time)))