Merge branch 'maint'

2017-07-04 00:20:12 +02:00 · 2017-07-04 00:20:12 +02:00 · a20c17fa51
parent 2e02581cbf cc5a9bf538
commit a20c17fa51
1 changed files with 1 additions and 1 deletions
--- a/lisp/org.el
+++ b/lisp/org.el
@ -14671,7 +14671,7 @@ it as a time string and apply `float-time' to it.  If S is nil, just return 0."
   ((numberp s) s)
   ((stringp s)
    (condition-case nil
-	(float-time (apply 'encode-time (org-parse-time-string s)))
+	(float-time (apply #'encode-time (org-parse-time-string s nil t)))
      (error 0.)))
   (t 0.)))