diff options
| author | Bastien | 2020-01-24 12:06:26 -0800 |
|---|---|---|
| committer | Paul Eggert | 2020-01-24 13:41:55 -0800 |
| commit | 9c576c207a8f4f98fd89deb4f3b4bfbe1ad37e37 (patch) | |
| tree | 5493e89b8ae64ed9a93000296312ec1d27e7ee0b | |
| parent | fcad41c14db874f139db45cbf9e90f7309687d20 (diff) | |
| download | emacs-9c576c207a8f4f98fd89deb4f3b4bfbe1ad37e37.tar.gz emacs-9c576c207a8f4f98fd89deb4f3b4bfbe1ad37e37.zip | |
Fix parse-time-string bug with ISO 8601 defaults
* lisp/calendar/parse-time.el (parse-time-string):
Do not use decoded-time-set-defaults; just let iso8601-parse
do its thing.
| -rw-r--r-- | lisp/calendar/parse-time.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/calendar/parse-time.el b/lisp/calendar/parse-time.el index 6a4612297c7..b199fca2db5 100644 --- a/lisp/calendar/parse-time.el +++ b/lisp/calendar/parse-time.el | |||
| @@ -158,7 +158,7 @@ The values returned are identical to those of `decode-time', but | |||
| 158 | any unknown values other than DST are returned as nil, and an | 158 | any unknown values other than DST are returned as nil, and an |
| 159 | unknown DST value is returned as -1." | 159 | unknown DST value is returned as -1." |
| 160 | (condition-case () | 160 | (condition-case () |
| 161 | (decoded-time-set-defaults (iso8601-parse string)) | 161 | (iso8601-parse string) |
| 162 | (wrong-type-argument | 162 | (wrong-type-argument |
| 163 | (let ((time (list nil nil nil nil nil nil nil -1 nil)) | 163 | (let ((time (list nil nil nil nil nil nil nil -1 nil)) |
| 164 | (temp (parse-time-tokenize (downcase string)))) | 164 | (temp (parse-time-tokenize (downcase string)))) |