diff options
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/calendar/timeclock.el | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 641f727c45d..1c9bb5eef74 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,10 @@ 2000-10-13 John Wiegley <johnw@gnu.org> + * calendar/timeclock.el (timeclock-find-discrep): A fix to same + faulty math, where holiday hours were being computing as seconds. + +2000-10-13 John Wiegley <johnw@gnu.org> + * desktop.el (desktop-buffer-modes-to-save): Added a global for specifying what "other" kinds of buffers should be saved. This used to be hard-coded. diff --git a/lisp/calendar/timeclock.el b/lisp/calendar/timeclock.el index f8daa32a1a1..f82d93fef23 100644 --- a/lisp/calendar/timeclock.el +++ b/lisp/calendar/timeclock.el @@ -679,7 +679,7 @@ identical to what would be return if `timeclock-relative' were nil." (setq last-date-limited (timeclock-time-to-date (cadr event)) last-date-seconds - (string-to-number (nth 2 event)))) + (* (string-to-number (nth 2 event)) 3600))) ((equal (car event) "i") (when (and (nth 2 event) (> (length (nth 2 event)) 0)) |