|
@@ -1914,13 +1914,10 @@ PROPNAME lets you set a custom text property instead of :org-clock-minutes."
|
|
|
(cond
|
|
|
((match-end 2)
|
|
|
;; Two time stamps.
|
|
|
- (let* ((ts (float-time
|
|
|
- (apply #'encode-time
|
|
|
- (save-match-data
|
|
|
- (org-parse-time-string (match-string 2))))))
|
|
|
- (te (float-time
|
|
|
- (apply #'encode-time
|
|
|
- (org-parse-time-string (match-string 3)))))
|
|
|
+ (let* ((ss (match-string 2))
|
|
|
+ (se (match-string 3))
|
|
|
+ (ts (org-time-string-to-seconds ss))
|
|
|
+ (te (org-time-string-to-seconds se))
|
|
|
(dt (- (if tend (min te tend) te)
|
|
|
(if tstart (max ts tstart) ts))))
|
|
|
(when (> dt 0) (cl-incf t1 (floor dt 60)))))
|
|
@@ -3052,10 +3049,8 @@ Otherwise, return nil."
|
|
|
(end-of-line 1)
|
|
|
(setq ts (match-string 1)
|
|
|
te (match-string 3))
|
|
|
- (setq s (- (float-time
|
|
|
- (apply #'encode-time (org-parse-time-string te)))
|
|
|
- (float-time
|
|
|
- (apply #'encode-time (org-parse-time-string ts))))
|
|
|
+ (setq s (- (org-time-string-to-seconds te)
|
|
|
+ (org-time-string-to-seconds ts))
|
|
|
neg (< s 0)
|
|
|
s (abs s)
|
|
|
h (floor (/ s 3600))
|