[Emacs-diffs] Changes to emacs/lisp/calendar/timeclock.el [emacs-unicode-2]

[Miles Bader]

Index: emacs/lisp/calendar/timeclock.el
diff -c emacs/lisp/calendar/timeclock.el:1.27.2.1 
emacs/lisp/calendar/timeclock.el:1.27.2.2
*** emacs/lisp/calendar/timeclock.el:1.27.2.1   Fri Apr 16 12:50:12 2004
--- emacs/lisp/calendar/timeclock.el    Mon Jun 28 07:29:41 2004
***************
*** 1129,1140 ****
  
  ;;; A reporting function that uses timeclock-log-data
  
- (defun timeclock-time-less-p (t1 t2)
-   "Say whether time T1 is less than time T2."
-   (or (< (car t1) (car t2))
-       (and (= (car t1) (car t2))
-          (< (nth 1 t1) (nth 1 t2)))))
- 
  (defun timeclock-day-base (&optional time)
    "Given a time within a day, return 0:0:0 within that day.
  If optional argument TIME is non-nil, use that instead of the current time."
--- 1129,1134 ----
***************
*** 1190,1201 ****
                                 (* 2 7 24 60 60))))
              two-week-len today-len)
          (while proj-data
!           (if (not (timeclock-time-less-p
                      (timeclock-entry-begin (car proj-data)) today))
                (setq today-len (timeclock-entry-list-length proj-data)
                      proj-data nil)
              (if (and (null two-week-len)
!                      (not (timeclock-time-less-p
                             (timeclock-entry-begin (car proj-data))
                             two-weeks-ago)))
                  (setq two-week-len (timeclock-entry-list-length proj-data)))
--- 1184,1195 ----
                                 (* 2 7 24 60 60))))
              two-week-len today-len)
          (while proj-data
!           (if (not (time-less-p
                      (timeclock-entry-begin (car proj-data)) today))
                (setq today-len (timeclock-entry-list-length proj-data)
                      proj-data nil)
              (if (and (null two-week-len)
!                      (not (time-less-p
                             (timeclock-entry-begin (car proj-data))
                             two-weeks-ago)))
                  (setq two-week-len (timeclock-entry-list-length proj-data)))
***************
*** 1260,1266 ****
          (while day-list
            (let ((i 0) (l 5))
              (while (< i l)
!               (unless (timeclock-time-less-p
                         (timeclock-day-begin (car day-list))
                         (aref lengths i))
                  (let ((base (timeclock-time-to-seconds
--- 1254,1260 ----
          (while day-list
            (let ((i 0) (l 5))
              (while (< i l)
!               (unless (time-less-p
                         (timeclock-day-begin (car day-list))
                         (aref lengths i))
                  (let ((base (timeclock-time-to-seconds