diff options
| author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2017-07-10 10:58:42 +0200 |
|---|---|---|
| committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2017-07-10 10:58:42 +0200 |
| commit | 163c84f2ee6d6b9b8908cd78792bcad0c4d9f6b6 (patch) | |
| tree | 6ea4232a0a5ec8fdd4467c94165e04d621a5052a | |
| parent | f8d0ef1b526b225d79b06ffe92b1dc9c5ab0e712 (diff) | |
| parent | 60eda8e4ec43f57a1ff39f8cc352f124939d2d37 (diff) | |
| download | org-mode-163c84f2ee6d6b9b8908cd78792bcad0c4d9f6b6.tar.gz | |
Merge branch 'maint'
| -rw-r--r-- | lisp/org-clock.el | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lisp/org-clock.el b/lisp/org-clock.el index c39305e..8e04aec 100644 --- a/lisp/org-clock.el +++ b/lisp/org-clock.el @@ -2703,8 +2703,7 @@ LEVEL is an integer. Indent by two spaces per level above 1." (pcase-let ((`(,month ,day ,year) (calendar-gregorian-from-absolute ts))) (setq ts (float-time (encode-time 0 0 0 day month year))))) (ts - (setq ts (float-time - (apply #'encode-time (org-parse-time-string ts nil t)))))) + (setq ts (float-time (apply #'encode-time (org-parse-time-string ts)))))) (cond ((numberp te) ;; Likewise for te. |