Merge branch 'maint'

2017-06-16 07:59:18 +02:00 · 2017-06-16 07:59:18 +02:00 · 080dc4b445
parent 32676822de 673fe87b05
commit 080dc4b445
1 changed files with 5 additions and 1 deletions
--- a/lisp/org.el
+++ b/lisp/org.el
@ -17826,7 +17826,11 @@ in the TZ environment variable."
 	       (string-to-number (match-string 2 s))
 	       nil nil zone))
 	((string-match "^<[^>]+>$" s)
-	 (decode-time (seconds-to-time (org-matcher-time s)) zone))
+	 ;; FIXME: `decode-time' needs to be called with ZONE as its
+	 ;; second argument.  However, this requires at least Emacs
+	 ;; 25.1.  We can do it when we switch to this version as our
+	 ;; minimal requirement.
+	 (decode-time (seconds-to-time (org-matcher-time s))))
 	(t (error "Not a standard Org time string: %s" s))))

 (defun org-timestamp-up (&optional arg)