Show
Ignore:
Timestamp:
08/10/06 11:19:54 (2 years ago)
Author:
miyoshi
Message:

Sync up with Emacs CVS HEAD.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/lisp/calendar/timeclock.el

    r4037 r4140  
    9696 
    9797(defcustom timeclock-relative t 
    98   "*Whether to maken reported time relative to `timeclock-workday'. 
     98  "*Whether to make reported time relative to `timeclock-workday'. 
    9999For example, if the length of a normal workday is eight hours, and you 
    100100work four hours on Monday, then the amount of time \"remaining\" on 
    …… 
    252252call `timeclock-workday-elapsed', to determine how much time has been 
    253253worked so far today.  Also, if `timeclock-relative' is nil, this value 
    254 will be the same as `timeclock-discrepancy'.") ; ? gm 
     254will be the same as `timeclock-discrepancy'.") 
     255 
     256(defvar timeclock-use-elapsed nil 
     257  "Non-nil if the modeline should display time elapsed, not remaining.") 
    255258 
    256259(defvar timeclock-last-period nil 
    …… 
    425428worked today, ignoring the time worked on previous days." 
    426429  (interactive "P") 
    427   (let ((remainder (timeclock-workday-remaining)) ; today-only? 
     430  (let ((remainder (timeclock-workday-remaining 
     431                    (or today-only 
     432                        (not timeclock-relative)))) 
    428433        (last-in (equal (car timeclock-last-event) "i")) 
    429434        status) 
    …… 
    620625that variable's documentation." 
    621626  (interactive) 
    622   (let ((remainder (timeclock-workday-remaining (not timeclock-relative))) 
     627  (let ((remainder 
     628         (if timeclock-use-elapsed 
     629             (timeclock-workday-elapsed) 
     630           (timeclock-workday-remaining (not timeclock-relative)))) 
    623631        (last-in (equal (car timeclock-last-event) "i"))) 
    624632    (when (and (< remainder 0)