Bug fix for timeclock.el

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 641f727c45da77f6c930ee2e7674d1c3be8c37e7..1c9bb5eef74ac48007d953fe839d3c350002a203 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+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

diff --git a/lisp/calendar/timeclock.el b/lisp/calendar/timeclock.el
index f8daa32a1a170093b5af564a2e3ed04f244fc8ad..f82d93fef236c260da45cbb19ddfa7432c987aae 100644 (file)
--- 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))