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

[Timeline] Fix position of new clock line after conflict resolution

This commit is contained in:
Daniel - 2019-02-17 10:01:34 +01:00
parent b8264a0c15
commit c3f45574f0
Signed by: dbo
GPG Key ID: 4F63DB96D45AA9C6
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
site-lisp/timeline-tools.el
View File

@ -678,11 +678,16 @@ not given, update clock lines in the buffer of TARGET-MARKER."
(let ((new-start (float-time start))
(new-end (float-time end))
(org-buffers (if buffers buffers (list (marker-buffer target-marker)))))
(org-with-point-at target-marker
(org-clock-find-position nil)
(open-line 1)
(insert (apply #'timeline-tools-clockline-no-conflict
new-start new-end org-buffers)))))
(let ((clock-line (apply #'timeline-tools-clockline-no-conflict
new-start new-end org-buffers)))
(org-with-point-at target-marker
(org-clock-find-position t)
;; if there is an unclosed clock line, add new clock line after it
(when (and (looking-at "^CLOCK:")
(not (looking-at ".* => ")))
(forward-line 1))
(open-line 1)
(insert clock-line)))))
;;;###autoload
(defun timeline-tools-clockline-no-org-agenda-conflicts ()