From 0b4e003766f15225dede9bdba4ead33e493856e2 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Wed, 26 Jun 2019 10:24:59 -0400 Subject: Revert "* lisp/calc/calc-ext.el (math-scalarp): Fix typo" This reverts commit 698ff554ac2699ec48fefc85a1307cbc4a183b0d. --- lisp/calendar/time-date.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lisp/calendar') 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)) -- cgit v1.2.1