diff options
| author | Paul Eggert | 2017-12-08 12:11:25 -0800 |
|---|---|---|
| committer | Paul Eggert | 2017-12-08 12:12:39 -0800 |
| commit | ff105b366c2477976948772822d3f5303121b9d5 (patch) | |
| tree | cecc6ea310414b4ff4400563eafe898635425c2f | |
| parent | 47423f0603f2ecfb78352be5477fb02c44f1fd35 (diff) | |
| download | emacs-ff105b366c2477976948772822d3f5303121b9d5.tar.gz emacs-ff105b366c2477976948772822d3f5303121b9d5.zip | |
Fix daylight-saving inference for Irish time
* lisp/calendar/cal-dst.el (calendar-dst-find-data): Do not assume
that daylight-saving time has a greater UT offset than standard
time. The reverse is true in Ireland, where standard time "IST"
is UTC +01 in summer and daylight-saving time "GMT" is UTC +00 in
winter. The current Irish rules are given by the POSIX setting
TZ='IST-1GMT0,M10.5.0,M3.5.0/1'.
| -rw-r--r-- | lisp/calendar/cal-dst.el | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/lisp/calendar/cal-dst.el b/lisp/calendar/cal-dst.el index 6b55ea479f1..5b7f3127a6e 100644 --- a/lisp/calendar/cal-dst.el +++ b/lisp/calendar/cal-dst.el | |||
| @@ -280,14 +280,11 @@ for `calendar-current-time-zone'." | |||
| 280 | (car t2-date-sec) t1-utc-diff)) | 280 | (car t2-date-sec) t1-utc-diff)) |
| 281 | (t1-time (/ (cdr t1-date-sec) 60)) | 281 | (t1-time (/ (cdr t1-date-sec) 60)) |
| 282 | (t2-time (/ (cdr t2-date-sec) 60))) | 282 | (t2-time (/ (cdr t2-date-sec) 60))) |
| 283 | (cons | 283 | (if (nth 7 (decode-time t1)) |
| 284 | (/ (min t0-utc-diff t1-utc-diff) 60) | 284 | (list (/ t0-utc-diff 60) (/ (- t1-utc-diff t0-utc-diff) 60) |
| 285 | (cons | 285 | t0-name t1-name t1-rules t2-rules t1-time t2-time) |
| 286 | (/ (abs (- t0-utc-diff t1-utc-diff)) 60) | 286 | (list (/ t1-utc-diff 60) (/ (- t0-utc-diff t1-utc-diff) 60) |
| 287 | (if (< t0-utc-diff t1-utc-diff) | 287 | t1-name t0-name t2-rules t1-rules t2-time t1-time)))))))) |
| 288 | (list t0-name t1-name t1-rules t2-rules t1-time t2-time) | ||
| 289 | (list t1-name t0-name t2-rules t1-rules t2-time t1-time) | ||
| 290 | ))))))))) | ||
| 291 | 288 | ||
| 292 | (defvar calendar-dst-transition-cache nil | 289 | (defvar calendar-dst-transition-cache nil |
| 293 | "Internal cal-dst variable storing date of daylight saving time transitions. | 290 | "Internal cal-dst variable storing date of daylight saving time transitions. |