summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2017-06-16 07:58:18 +0200
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2017-06-16 07:58:18 +0200
commit673fe87b05fddf7f6cd68184081ae28c0805f5d4 (patch)
tree5f76bdbcfec95a3df51a80d859e080da7f4f29cb
parent01ba5cafa516452f3d69ca2d81be1d2cd74d8d76 (diff)
downloadorg-mode-673fe87b05fddf7f6cd68184081ae28c0805f5d4.tar.gz
Fix compilation warning
* lisp/org.el (org-parse-time-string): Fix compilation warning.
-rw-r--r--lisp/org.el6
1 files changed, 5 insertions, 1 deletions
diff --git a/lisp/org.el b/lisp/org.el
index c4eaf45..b89044c 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -17964,7 +17964,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)