ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into next

This commit is contained in:
Nicolas Goaziou 2018-11-17 21:47:12 +01:00
parent b5640ea801 fc9cf62bf3
commit a5df655f76
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lisp/org-clock.el
View File

@ -2712,7 +2712,7 @@ a number of clock tables."
(pcase-let (pcase-let
((`(,m ,d ,y) (calendar-gregorian-from-absolute n))) ((`(,m ,d ,y) (calendar-gregorian-from-absolute n)))
(list 0 0 org-extend-today-until d m y))) (list 0 0 org-extend-today-until d m y)))
(timestamp (org-parse-time-string timestamp))))) (timestamp (org-matcher-time timestamp)))))
(end (end
(apply #'encode-time (apply #'encode-time
(pcase (if range (nth 1 range) (plist-get params :tend)) (pcase (if range (nth 1 range) (plist-get params :tend))
@ -2720,7 +2720,7 @@ a number of clock tables."
(pcase-let (pcase-let
((`(,m ,d ,y) (calendar-gregorian-from-absolute n))) ((`(,m ,d ,y) (calendar-gregorian-from-absolute n)))
(list 0 0 org-extend-today-until d m y))) (list 0 0 org-extend-today-until d m y)))
(timestamp (org-parse-time-string timestamp)))))) (timestamp (org-matcher-time timestamp))))))
(while (time-less-p start end) (while (time-less-p start end)
(unless (bolp) (insert "\n")) (unless (bolp) (insert "\n"))
;; Insert header before each clock table. ;; Insert header before each clock table.