Browse Source

Fix "Invalid time zone specification" error

* lisp/org.el (org-timestamp-change): Correctly handle `encode-time'
  parameters.

Suggested-by: Derek Feichtinger <dfeich@gmail.com>
Reported-by: Eric Abrahamsen <eric@ericabrahamsen.net>
<http://permalink.gmane.org/gmane.emacs.orgmode/106344>
Nicolas Goaziou 9 years ago
parent
commit
e0acd8a15a
1 changed files with 8 additions and 7 deletions
  1. 8 7
      lisp/org.el

+ 8 - 7
lisp/org.el

@@ -18034,13 +18034,14 @@ When SUPPRESS-TMP-DELAY is non-nil, suppress delays like \"--2d\"."
 	  (setcar (cdr time0) (+ (nth 1 time0)
 				 (if (> n 0) (- rem) (- dm rem))))))
       (setq time
-	    (encode-time (or (car time0) 0)
-			 (+ (if (eq org-ts-what 'minute) n 0) (nth 1 time0))
-			 (+ (if (eq org-ts-what 'hour) n 0)   (nth 2 time0))
-			 (+ (if (eq org-ts-what 'day) n 0)    (nth 3 time0))
-			 (+ (if (eq org-ts-what 'month) n 0)  (nth 4 time0))
-			 (+ (if (eq org-ts-what 'year) n 0)   (nth 5 time0))
-			 (nthcdr 6 time0)))
+	    (apply #'encode-time
+		   (or (car time0) 0)
+		   (+ (if (eq org-ts-what 'minute) n 0) (nth 1 time0))
+		   (+ (if (eq org-ts-what 'hour) n 0)   (nth 2 time0))
+		   (+ (if (eq org-ts-what 'day) n 0)    (nth 3 time0))
+		   (+ (if (eq org-ts-what 'month) n 0)  (nth 4 time0))
+		   (+ (if (eq org-ts-what 'year) n 0)   (nth 5 time0))
+		   (nthcdr 6 time0)))
       (when (and (member org-ts-what '(hour minute))
 		 extra
 		 (string-match "-\\([012][0-9]\\):\\([0-5][0-9]\\)" extra))