Explorar o código

Merge branch 'master' into next

Nicolas Goaziou %!s(int64=6) %!d(string=hai) anos
pai
achega
a5df655f76
Modificáronse 1 ficheiros con 2 adicións e 2 borrados
  1. 2 2
      lisp/org-clock.el

+ 2 - 2
lisp/org-clock.el

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