dbo/.emacs.d
dbo
/
.emacs.d
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[Org] Another attempt to fix condition on current clock

This commit is contained in:
Daniel - 2017-12-03 09:47:36 +01:00
parent 41a57ecd96
commit 53e81f252e
Signed by: dbo
GPG Key ID: 4F63DB96D45AA9C6
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
site-lisp/db-org.el
View File

@ -980,7 +980,8 @@ heading and CLOCK-TIMES consists of cons cells of the form (START
a clock line for this task. START and END are times as returned a clock line for this task. START and END are times as returned
by FLOAT-TIME, which see. No truncation with respect to TSTART by FLOAT-TIME, which see. No truncation with respect to TSTART
and TEND is done, i.e., START or END may lie outside of these and TEND is done, i.e., START or END may lie outside of these
limits, but it is always true that TSTART ≤ END or START ≤ TEND." limits, but it is always true that TSTART ≤ END ≤ TEND or
TSTART ≤ START ≤ TEND."
;; adapted from `org-clock-sum’ ;; adapted from `org-clock-sum’
(when (eq major-mode 'org-mode) (when (eq major-mode 'org-mode)
(let* ((re (concat "^\\(\\*+\\)[ \t]\\|^[ \t]*" (let* ((re (concat "^\\(\\*+\\)[ \t]\\|^[ \t]*"
@ -1021,9 +1022,9 @@ limits, but it is always true that TSTART ≤ END or START ≤ TEND."
(eq (org-clocking-buffer) (current-buffer)) (eq (org-clocking-buffer) (current-buffer))
(eq (marker-position org-clock-hd-marker) (point)) (eq (marker-position org-clock-hd-marker) (point))
(or (and tstart (or (and tstart
(<= tstart (float-time org-clock-start-time))) (<= tstart (float-time org-clock-start-time) tend))
(and tend (and tend
(<= (float-time) tend)))) (<= tstart (float-time) tend))))
(push (cons (float-time org-clock-start-time) (float-time)) (push (cons (float-time org-clock-start-time) (float-time))
times)) times))
(when (not (null times)) (when (not (null times))