diff options
| author | Juanma Barranquero | 2004-04-27 22:44:39 +0000 |
|---|---|---|
| committer | Juanma Barranquero | 2004-04-27 22:44:39 +0000 |
| commit | 1c226f2ba57eb267665b62ec6fb6660d72430800 (patch) | |
| tree | 8881b1e5f6847a2cca0f57152262b62fb0db6866 | |
| parent | d1c436377534ad40e5957c5020fa9045c0a0ba81 (diff) | |
| download | emacs-1c226f2ba57eb267665b62ec6fb6660d72430800.tar.gz emacs-1c226f2ba57eb267665b62ec6fb6660d72430800.zip | |
(timeclock-time-less-p): Remove.
(timeclock-generate-report): Use `time-less-p'.
| -rw-r--r-- | lisp/calendar/timeclock.el | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/lisp/calendar/timeclock.el b/lisp/calendar/timeclock.el index 0507ddab64a..709ea25fbcb 100644 --- a/lisp/calendar/timeclock.el +++ b/lisp/calendar/timeclock.el | |||
| @@ -1129,12 +1129,6 @@ discrepancy, today's discrepancy, and the time worked today." | |||
| 1129 | 1129 | ||
| 1130 | ;;; A reporting function that uses timeclock-log-data | 1130 | ;;; A reporting function that uses timeclock-log-data |
| 1131 | 1131 | ||
| 1132 | (defun timeclock-time-less-p (t1 t2) | ||
| 1133 | "Say whether time T1 is less than time T2." | ||
| 1134 | (or (< (car t1) (car t2)) | ||
| 1135 | (and (= (car t1) (car t2)) | ||
| 1136 | (< (nth 1 t1) (nth 1 t2))))) | ||
| 1137 | |||
| 1138 | (defun timeclock-day-base (&optional time) | 1132 | (defun timeclock-day-base (&optional time) |
| 1139 | "Given a time within a day, return 0:0:0 within that day. | 1133 | "Given a time within a day, return 0:0:0 within that day. |
| 1140 | If optional argument TIME is non-nil, use that instead of the current time." | 1134 | If optional argument TIME is non-nil, use that instead of the current time." |
| @@ -1190,12 +1184,12 @@ HTML-P is non-nil, HTML markup is added." | |||
| 1190 | (* 2 7 24 60 60)))) | 1184 | (* 2 7 24 60 60)))) |
| 1191 | two-week-len today-len) | 1185 | two-week-len today-len) |
| 1192 | (while proj-data | 1186 | (while proj-data |
| 1193 | (if (not (timeclock-time-less-p | 1187 | (if (not (time-less-p |
| 1194 | (timeclock-entry-begin (car proj-data)) today)) | 1188 | (timeclock-entry-begin (car proj-data)) today)) |
| 1195 | (setq today-len (timeclock-entry-list-length proj-data) | 1189 | (setq today-len (timeclock-entry-list-length proj-data) |
| 1196 | proj-data nil) | 1190 | proj-data nil) |
| 1197 | (if (and (null two-week-len) | 1191 | (if (and (null two-week-len) |
| 1198 | (not (timeclock-time-less-p | 1192 | (not (time-less-p |
| 1199 | (timeclock-entry-begin (car proj-data)) | 1193 | (timeclock-entry-begin (car proj-data)) |
| 1200 | two-weeks-ago))) | 1194 | two-weeks-ago))) |
| 1201 | (setq two-week-len (timeclock-entry-list-length proj-data))) | 1195 | (setq two-week-len (timeclock-entry-list-length proj-data))) |
| @@ -1260,7 +1254,7 @@ HTML-P is non-nil, HTML markup is added." | |||
| 1260 | (while day-list | 1254 | (while day-list |
| 1261 | (let ((i 0) (l 5)) | 1255 | (let ((i 0) (l 5)) |
| 1262 | (while (< i l) | 1256 | (while (< i l) |
| 1263 | (unless (timeclock-time-less-p | 1257 | (unless (time-less-p |
| 1264 | (timeclock-day-begin (car day-list)) | 1258 | (timeclock-day-begin (car day-list)) |
| 1265 | (aref lengths i)) | 1259 | (aref lengths i)) |
| 1266 | (let ((base (timeclock-time-to-seconds | 1260 | (let ((base (timeclock-time-to-seconds |