diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2019-06-26 10:24:59 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2019-06-26 10:24:59 -0400 |
| commit | 0b4e003766f15225dede9bdba4ead33e493856e2 (patch) | |
| tree | 99de57fe8feeca540f398acb232b75e9c802418c /lisp/calendar/time-date.el | |
| parent | 699fce296b13d7db386b1cb5cecf2710e5196691 (diff) | |
| download | emacs-0b4e003766f15225dede9bdba4ead33e493856e2.tar.gz | |
Revert "* lisp/calc/calc-ext.el (math-scalarp): Fix typo"
This reverts commit 698ff554ac2699ec48fefc85a1307cbc4a183b0d.
Diffstat (limited to 'lisp/calendar/time-date.el')
| -rw-r--r-- | lisp/calendar/time-date.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/calendar/time-date.el b/lisp/calendar/time-date.el index dad87dc8c97..2c0280ccf3b 100644 --- a/lisp/calendar/time-date.el +++ b/lisp/calendar/time-date.el @@ -156,9 +156,9 @@ If DATE lacks timezone information, GMT is assumed." (let ((overflow-error '(error "Specified time is not representable"))) (if (equal err overflow-error) (signal (car err) (cdr err)) - (condition-case-unless-debug err + (condition-case err (encode-time (parse-time-string - (timezone-make-date-arpa-standard date))) + (timezone-make-date-arpa-standard date))) (error (if (equal err overflow-error) (signal (car err) (cdr err)) |