aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Wiegley2000-10-13 09:35:36 +0000
committerJohn Wiegley2000-10-13 09:35:36 +0000
commit16908a3f0dfbaac0e580412b68056df60bd41e91 (patch)
treed4161002120644b98659318bc6c342821a955c56
parent4473cdd9af0d61cdf31ce30472e7041348468feb (diff)
downloademacs-16908a3f0dfbaac0e580412b68056df60bd41e91.tar.gz
emacs-16908a3f0dfbaac0e580412b68056df60bd41e91.zip
Bug fix for timeclock.el
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/calendar/timeclock.el2
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 @@
12000-10-13 John Wiegley <johnw@gnu.org> 12000-10-13 John Wiegley <johnw@gnu.org>
2 2
3 * calendar/timeclock.el (timeclock-find-discrep): A fix to same
4 faulty math, where holiday hours were being computing as seconds.
5
62000-10-13 John Wiegley <johnw@gnu.org>
7
3 * desktop.el (desktop-buffer-modes-to-save): Added a global for 8 * desktop.el (desktop-buffer-modes-to-save): Added a global for
4 specifying what "other" kinds of buffers should be saved. This 9 specifying what "other" kinds of buffers should be saved. This
5 used to be hard-coded. 10 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."
679 (setq last-date-limited 679 (setq last-date-limited
680 (timeclock-time-to-date (cadr event)) 680 (timeclock-time-to-date (cadr event))
681 last-date-seconds 681 last-date-seconds
682 (string-to-number (nth 2 event)))) 682 (* (string-to-number (nth 2 event)) 3600)))
683 ((equal (car event) "i") 683 ((equal (car event) "i")
684 (when (and (nth 2 event) 684 (when (and (nth 2 event)
685 (> (length (nth 2 event)) 0)) 685 (> (length (nth 2 event)) 0))