diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2019-04-30 10:45:48 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2019-04-30 10:47:17 -0700 |
| commit | 325f51c84d9ad4d9776784bd324b347ffe4fe51b (patch) | |
| tree | 105c43ee218925018d5e778a0b8d52fc02307e69 | |
| parent | 35ef33dd234707d611e2a307a3500b4dbcf46cf6 (diff) | |
| download | emacs-325f51c84d9ad4d9776784bd324b347ffe4fe51b.tar.gz | |
Fix decode-time/encode-time roundtrip on macOS
* src/timefns.c (Fencode_time): Ignore DST flag when the zone is
numeric or is a cons, as the doc string says it’s ignored in that
case, and not ignoring it causes encode-time to not invert
decode-time on some platforms (Bug#35502).
* test/src/timefns-tests.el (encode-time-dst-numeric-zone):
New test.
| -rw-r--r-- | src/timefns.c | 5 | ||||
| -rw-r--r-- | test/src/timefns-tests.el | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/src/timefns.c b/src/timefns.c index 5005c73b7fc..7b5af6a5d24 100644 --- a/src/timefns.c +++ b/src/timefns.c @@ -1488,10 +1488,11 @@ usage: (encode-time &optional TIME FORM &rest OBSOLESCENT-ARGUMENTS) */) tm.tm_mon = check_tm_member (XCAR (a), 1); a = XCDR (a); tm.tm_year = check_tm_member (XCAR (a), TM_YEAR_BASE); a = XCDR (a); a = XCDR (a); - if (SYMBOLP (XCAR (a))) - tm.tm_isdst = !NILP (XCAR (a)); + Lisp_Object dstflag = XCAR (a); a = XCDR (a); zone = XCAR (a); + if (SYMBOLP (dstflag) && !FIXNUMP (zone) && !CONSP (zone)) + tm.tm_isdst = !NILP (dstflag); } else if (nargs < 6) xsignal2 (Qwrong_number_of_arguments, Qencode_time, make_fixnum (nargs)); diff --git a/test/src/timefns-tests.el b/test/src/timefns-tests.el index 5c858ef3bd8..2c90af757f0 100644 --- a/test/src/timefns-tests.el +++ b/test/src/timefns-tests.el @@ -142,3 +142,9 @@ (< 0.99 (/ x y) 1.01) (< 0.99 (/ (- (float-time a)) (float-time b)) 1.01)))))))) + +(ert-deftest encode-time-dst-numeric-zone () + "Check for Bug#35502." + (should (time-equal-p + (encode-time '(29 31 17 30 4 2019 2 t 7200)) + '(23752 27217)))) |