2017-12-04 20:50:14 +00:00
|
|
|
;;; cal-dst.el --- calendar functions for daylight saving rules -*- lexical-binding:t -*-
|
* cal-dst.el: New file.
(calendar-/, calendar-%, calendar-absolute-from-time,
calendar-time-from-absolute, calendar-next-time-zone-transition,
calendar-time-zone-daylight-rules): New functions.
(calendar-current-time-zone): Moved from calendar.el and rewritten.
(calendar-current-time-zone-cache): New variable.
(calendar-current-time-zone, calendar-time-zone,
calendar-daylight-time-offset, calendar-standard-time-zone-name,
calendar-daylight-time-zone-name,
calendar-daylight-savings-starts, calendar-daylight-savings-ends,
calendar-daylight-savings-switchover-time): Moved from calendar.el.
1993-06-22 03:25:13 +00:00
|
|
|
|
2019-01-01 00:59:58 +00:00
|
|
|
;; Copyright (C) 1993-1996, 2001-2019 Free Software Foundation, Inc.
|
* cal-dst.el: New file.
(calendar-/, calendar-%, calendar-absolute-from-time,
calendar-time-from-absolute, calendar-next-time-zone-transition,
calendar-time-zone-daylight-rules): New functions.
(calendar-current-time-zone): Moved from calendar.el and rewritten.
(calendar-current-time-zone-cache): New variable.
(calendar-current-time-zone, calendar-time-zone,
calendar-daylight-time-offset, calendar-standard-time-zone-name,
calendar-daylight-time-zone-name,
calendar-daylight-savings-starts, calendar-daylight-savings-ends,
calendar-daylight-savings-switchover-time): Moved from calendar.el.
1993-06-22 03:25:13 +00:00
|
|
|
|
2019-05-26 07:58:28 +00:00
|
|
|
;; Author: Paul Eggert <eggert@cs.ucla.edu>
|
2008-03-13 06:29:28 +00:00
|
|
|
;; Edward M. Reingold <reingold@cs.uiuc.edu>
|
2019-06-01 19:11:55 +00:00
|
|
|
;; Maintainer: emacs-devel@gnu.org
|
* cal-dst.el: New file.
(calendar-/, calendar-%, calendar-absolute-from-time,
calendar-time-from-absolute, calendar-next-time-zone-transition,
calendar-time-zone-daylight-rules): New functions.
(calendar-current-time-zone): Moved from calendar.el and rewritten.
(calendar-current-time-zone-cache): New variable.
(calendar-current-time-zone, calendar-time-zone,
calendar-daylight-time-offset, calendar-standard-time-zone-name,
calendar-daylight-time-zone-name,
calendar-daylight-savings-starts, calendar-daylight-savings-ends,
calendar-daylight-savings-switchover-time): Moved from calendar.el.
1993-06-22 03:25:13 +00:00
|
|
|
;; Keywords: calendar
|
2007-03-17 17:49:59 +00:00
|
|
|
;; Human-Keywords: daylight saving time, calendar, diary, holidays
|
2010-08-29 16:17:13 +00:00
|
|
|
;; Package: calendar
|
* cal-dst.el: New file.
(calendar-/, calendar-%, calendar-absolute-from-time,
calendar-time-from-absolute, calendar-next-time-zone-transition,
calendar-time-zone-daylight-rules): New functions.
(calendar-current-time-zone): Moved from calendar.el and rewritten.
(calendar-current-time-zone-cache): New variable.
(calendar-current-time-zone, calendar-time-zone,
calendar-daylight-time-offset, calendar-standard-time-zone-name,
calendar-daylight-time-zone-name,
calendar-daylight-savings-starts, calendar-daylight-savings-ends,
calendar-daylight-savings-switchover-time): Moved from calendar.el.
1993-06-22 03:25:13 +00:00
|
|
|
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
|
2008-05-06 03:07:58 +00:00
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
1994-04-07 20:30:18 +00:00
|
|
|
;; it under the terms of the GNU General Public License as published by
|
2008-05-06 03:07:58 +00:00
|
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
|
|
;; (at your option) any later version.
|
1994-04-07 20:30:18 +00:00
|
|
|
|
* cal-dst.el: New file.
(calendar-/, calendar-%, calendar-absolute-from-time,
calendar-time-from-absolute, calendar-next-time-zone-transition,
calendar-time-zone-daylight-rules): New functions.
(calendar-current-time-zone): Moved from calendar.el and rewritten.
(calendar-current-time-zone-cache): New variable.
(calendar-current-time-zone, calendar-time-zone,
calendar-daylight-time-offset, calendar-standard-time-zone-name,
calendar-daylight-time-zone-name,
calendar-daylight-savings-starts, calendar-daylight-savings-ends,
calendar-daylight-savings-switchover-time): Moved from calendar.el.
1993-06-22 03:25:13 +00:00
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
1994-04-07 20:30:18 +00:00
|
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
;; GNU General Public License for more details.
|
|
|
|
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
2017-09-13 22:52:52 +00:00
|
|
|
;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
|
* cal-dst.el: New file.
(calendar-/, calendar-%, calendar-absolute-from-time,
calendar-time-from-absolute, calendar-next-time-zone-transition,
calendar-time-zone-daylight-rules): New functions.
(calendar-current-time-zone): Moved from calendar.el and rewritten.
(calendar-current-time-zone-cache): New variable.
(calendar-current-time-zone, calendar-time-zone,
calendar-daylight-time-offset, calendar-standard-time-zone-name,
calendar-daylight-time-zone-name,
calendar-daylight-savings-starts, calendar-daylight-savings-ends,
calendar-daylight-savings-switchover-time): Moved from calendar.el.
1993-06-22 03:25:13 +00:00
|
|
|
|
|
|
|
;;; Commentary:
|
|
|
|
|
2008-04-01 02:39:52 +00:00
|
|
|
;; See calendar.el.
|
* cal-dst.el: New file.
(calendar-/, calendar-%, calendar-absolute-from-time,
calendar-time-from-absolute, calendar-next-time-zone-transition,
calendar-time-zone-daylight-rules): New functions.
(calendar-current-time-zone): Moved from calendar.el and rewritten.
(calendar-current-time-zone-cache): New variable.
(calendar-current-time-zone, calendar-time-zone,
calendar-daylight-time-offset, calendar-standard-time-zone-name,
calendar-daylight-time-zone-name,
calendar-daylight-savings-starts, calendar-daylight-savings-ends,
calendar-daylight-savings-switchover-time): Moved from calendar.el.
1993-06-22 03:25:13 +00:00
|
|
|
|
|
|
|
;;; Code:
|
|
|
|
|
|
|
|
(require 'calendar)
|
|
|
|
|
2008-03-07 05:13:00 +00:00
|
|
|
|
|
|
|
(defgroup calendar-dst nil
|
|
|
|
"Options related to Daylight Saving Time."
|
|
|
|
:prefix "calendar-"
|
|
|
|
:group 'calendar)
|
|
|
|
|
|
|
|
|
2006-11-10 08:54:38 +00:00
|
|
|
(defcustom calendar-dst-check-each-year-flag t
|
|
|
|
"Non-nil means to check each year for DST transitions as needed.
|
2006-11-10 15:04:03 +00:00
|
|
|
Otherwise assume the next two transitions found after the
|
2006-11-10 08:54:38 +00:00
|
|
|
current date apply to all years. This is faster, but not always
|
2007-03-17 17:49:59 +00:00
|
|
|
correct, since the dates of daylight saving transitions sometimes
|
2006-11-10 08:54:38 +00:00
|
|
|
change."
|
|
|
|
:type 'boolean
|
|
|
|
:version "22.1"
|
2008-04-11 03:43:55 +00:00
|
|
|
:group 'calendar-dst)
|
2006-11-10 08:54:38 +00:00
|
|
|
|
2008-03-07 05:13:00 +00:00
|
|
|
;;;###autoload
|
|
|
|
(put 'calendar-daylight-savings-starts 'risky-local-variable t)
|
|
|
|
(defcustom calendar-daylight-savings-starts '(calendar-dst-starts year)
|
|
|
|
"Sexp giving the date on which daylight saving time starts.
|
|
|
|
This is an expression in the variable `year' whose value gives the Gregorian
|
|
|
|
date in the form (month day year) on which daylight saving time starts. It is
|
|
|
|
used to determine the starting date of daylight saving time for the holiday
|
|
|
|
list and for correcting times of day in the solar and lunar calculations.
|
|
|
|
|
|
|
|
For example, if daylight saving time is mandated to start on October 1,
|
|
|
|
you would set `calendar-daylight-savings-starts' to
|
|
|
|
|
|
|
|
'(10 1 year)
|
|
|
|
|
|
|
|
If it starts on the first Sunday in April, you would set it to
|
|
|
|
|
|
|
|
'(calendar-nth-named-day 1 0 4 year)
|
|
|
|
|
|
|
|
If the locale never uses daylight saving time, set this to nil."
|
|
|
|
:type 'sexp
|
|
|
|
:group 'calendar-dst)
|
|
|
|
|
|
|
|
;;;###autoload
|
|
|
|
(put 'calendar-daylight-savings-ends 'risky-local-variable t)
|
|
|
|
(defcustom calendar-daylight-savings-ends '(calendar-dst-ends year)
|
|
|
|
"Sexp giving the date on which daylight saving time ends.
|
|
|
|
This is an expression in the variable `year' whose value gives the Gregorian
|
|
|
|
date in the form (month day year) on which daylight saving time ends. It is
|
|
|
|
used to determine the starting date of daylight saving time for the holiday
|
|
|
|
list and for correcting times of day in the solar and lunar calculations.
|
|
|
|
|
|
|
|
For example, if daylight saving time ends on the last Sunday in October:
|
|
|
|
|
2015-09-02 01:21:42 +00:00
|
|
|
(calendar-nth-named-day -1 0 10 year)
|
2008-03-07 05:13:00 +00:00
|
|
|
|
|
|
|
If the locale never uses daylight saving time, set this to nil."
|
|
|
|
:type 'sexp
|
|
|
|
:group 'calendar-dst)
|
|
|
|
|
|
|
|
;;; More defcustoms below.
|
|
|
|
|
|
|
|
|
* cal-dst.el: New file.
(calendar-/, calendar-%, calendar-absolute-from-time,
calendar-time-from-absolute, calendar-next-time-zone-transition,
calendar-time-zone-daylight-rules): New functions.
(calendar-current-time-zone): Moved from calendar.el and rewritten.
(calendar-current-time-zone-cache): New variable.
(calendar-current-time-zone, calendar-time-zone,
calendar-daylight-time-offset, calendar-standard-time-zone-name,
calendar-daylight-time-zone-name,
calendar-daylight-savings-starts, calendar-daylight-savings-ends,
calendar-daylight-savings-switchover-time): Moved from calendar.el.
1993-06-22 03:25:13 +00:00
|
|
|
(defvar calendar-current-time-zone-cache nil
|
2006-12-24 02:58:41 +00:00
|
|
|
"Cache for result of `calendar-current-time-zone'.")
|
2008-04-11 03:43:55 +00:00
|
|
|
;; It gets eval'd, eg by calendar-dst-starts.
|
|
|
|
;;;###autoload
|
|
|
|
(put 'calendar-current-time-zone-cache 'risky-local-variable t)
|
* cal-dst.el: New file.
(calendar-/, calendar-%, calendar-absolute-from-time,
calendar-time-from-absolute, calendar-next-time-zone-transition,
calendar-time-zone-daylight-rules): New functions.
(calendar-current-time-zone): Moved from calendar.el and rewritten.
(calendar-current-time-zone-cache): New variable.
(calendar-current-time-zone, calendar-time-zone,
calendar-daylight-time-offset, calendar-standard-time-zone-name,
calendar-daylight-time-zone-name,
calendar-daylight-savings-starts, calendar-daylight-savings-ends,
calendar-daylight-savings-switchover-time): Moved from calendar.el.
1993-06-22 03:25:13 +00:00
|
|
|
|
New (TICKS . HZ) timestamp format
This follows on a suggestion by Stefan Monnier in:
https://lists.gnu.org/r/emacs-devel/2018-08/msg00991.html
(Bug#32902).
* doc/lispref/buffers.texi (Modification Time):
* doc/lispref/os.texi (Processor Run Time, Time Calculations)
* doc/lispref/processes.texi (System Processes):
* doc/lispref/text.texi (Undo):
Let the "Time of Day" section cover timestamp format details.
* doc/lispref/os.texi (Time of Day):
Say that timestamp internal format should not be assumed.
Document new (ticks . hz) format. Omit mention of seconds-to-time
since it is now just an alias for encode-time.
(Time Conversion): Document encode-time extension.
* etc/NEWS: Mention changes.
* lisp/calendar/cal-dst.el (calendar-system-time-basis): Now const.
* lisp/calendar/cal-dst.el (calendar-absolute-from-time)
(calendar-time-from-absolute)
(calendar-next-time-zone-transition):
* lisp/emacs-lisp/timer.el (timer-next-integral-multiple-of-time):
Simplify by using bignums, (TICKS . HZ), and new encode-time.
* lisp/emacs-lisp/timer.el (timer-next-integral-multiple-of-time):
Simplify by using bignums and new encode-time.
* lisp/calendar/parse-time.el (parse-iso8601-time-string):
Handle DST more accurately, by using new encode-time.
* lisp/calendar/time-date.el (seconds-to-time):
* lisp/calendar/timeclock.el (timeclock-seconds-to-time):
Now just an alias for encode-time.
* lisp/calendar/time-date.el (days-to-time):
* lisp/emacs-lisp/timer.el (timer--time-setter):
* lisp/net/ntlm.el (ntlm-compute-timestamp):
* lisp/obsolete/vc-arch.el (vc-arch-add-tagline):
* lisp/org/org-id.el (org-id-uuid, org-id-time-to-b36):
* lisp/tar-mode (tar-octal-time):
Don't assume timestamps default to list form.
* lisp/tar-mode.el (tar-parse-octal-long-integer):
Now an obsolete alias for tar-parse-octal-integer.
* src/keyboard.c (decode_timer): Adjust to changes to
time decoding functions elsewhere.
* src/timefns.c: Include bignum.h, limits.h.
(FASTER_TIMEFNS): New macro.
(WARN_OBSOLETE_TIMESTAMPS, CURRENT_TIME_LIST)
(timespec_hz, trillion, ztrillion):
New constants.
(make_timeval): Use TIME_T_MAX instead of its definiens.
(check_time_validity, time_add, time_subtract):
Remove. All uses removed.
(disassemble_lisp_time): Remove; old code now folded into
decode_lisp_time. All callers changed.
(invalid_hz, s_ns_to_double, ticks_hz_list4, mpz_set_time)
(timespec_mpz, timespec_ticks, time_hz_ticks)
(lisp_time_hz_ticks, lisp_time_seconds)
(time_form_stamp, lisp_time_form_stamp, decode_ticks_hz)
(decode_lisp_time, mpz_time, list4_to_timespec):
New functions.
(decode_float_time, decode_time_components, lisp_to_timespec):
Adjust to new struct lisp_time, which does not lose
information like the old one did.
(enum timeform): New enum.
(decode_time_components): New arg FORM. All callers changed.
RESULT and DRESULT are now mutually exclusive; no callers need
to change because of this.
(decode_time_components, lisp_time_struct)
(lisp_seconds_argument, time_arith, make_lisp_time, Ffloat_time)
(Fencode_time):
Add support for (TICKS . HZ) form.
(DECODE_SECS_ONLY): New constant.
(lisp_time_struct): 2nd arg is now enum timeform, not int.
All callers changed.
(check_tm_member): Support bignums.m
(Fencode_time): Add new two-arg functionality.
* src/systime.h (struct lisp_time): Now ticks+hz rather than
hi+lo+us+ps, since ticks+hz does not lose info.
* test/src/systime-tests.el (time-equal-p-nil-nil):
New test.
2018-10-03 16:10:01 +00:00
|
|
|
(defconst calendar-system-time-basis
|
* cal-dst.el: New file.
(calendar-/, calendar-%, calendar-absolute-from-time,
calendar-time-from-absolute, calendar-next-time-zone-transition,
calendar-time-zone-daylight-rules): New functions.
(calendar-current-time-zone): Moved from calendar.el and rewritten.
(calendar-current-time-zone-cache): New variable.
(calendar-current-time-zone, calendar-time-zone,
calendar-daylight-time-offset, calendar-standard-time-zone-name,
calendar-daylight-time-zone-name,
calendar-daylight-savings-starts, calendar-daylight-savings-ends,
calendar-daylight-savings-switchover-time): Moved from calendar.el.
1993-06-22 03:25:13 +00:00
|
|
|
(calendar-absolute-from-gregorian '(1 1 1970))
|
|
|
|
"Absolute date of starting date of system clock.")
|
|
|
|
|
|
|
|
(defun calendar-absolute-from-time (x utc-diff)
|
|
|
|
"Absolute local date of time X; local time is UTC-DIFF seconds from UTC.
|
|
|
|
|
New (TICKS . HZ) timestamp format
This follows on a suggestion by Stefan Monnier in:
https://lists.gnu.org/r/emacs-devel/2018-08/msg00991.html
(Bug#32902).
* doc/lispref/buffers.texi (Modification Time):
* doc/lispref/os.texi (Processor Run Time, Time Calculations)
* doc/lispref/processes.texi (System Processes):
* doc/lispref/text.texi (Undo):
Let the "Time of Day" section cover timestamp format details.
* doc/lispref/os.texi (Time of Day):
Say that timestamp internal format should not be assumed.
Document new (ticks . hz) format. Omit mention of seconds-to-time
since it is now just an alias for encode-time.
(Time Conversion): Document encode-time extension.
* etc/NEWS: Mention changes.
* lisp/calendar/cal-dst.el (calendar-system-time-basis): Now const.
* lisp/calendar/cal-dst.el (calendar-absolute-from-time)
(calendar-time-from-absolute)
(calendar-next-time-zone-transition):
* lisp/emacs-lisp/timer.el (timer-next-integral-multiple-of-time):
Simplify by using bignums, (TICKS . HZ), and new encode-time.
* lisp/emacs-lisp/timer.el (timer-next-integral-multiple-of-time):
Simplify by using bignums and new encode-time.
* lisp/calendar/parse-time.el (parse-iso8601-time-string):
Handle DST more accurately, by using new encode-time.
* lisp/calendar/time-date.el (seconds-to-time):
* lisp/calendar/timeclock.el (timeclock-seconds-to-time):
Now just an alias for encode-time.
* lisp/calendar/time-date.el (days-to-time):
* lisp/emacs-lisp/timer.el (timer--time-setter):
* lisp/net/ntlm.el (ntlm-compute-timestamp):
* lisp/obsolete/vc-arch.el (vc-arch-add-tagline):
* lisp/org/org-id.el (org-id-uuid, org-id-time-to-b36):
* lisp/tar-mode (tar-octal-time):
Don't assume timestamps default to list form.
* lisp/tar-mode.el (tar-parse-octal-long-integer):
Now an obsolete alias for tar-parse-octal-integer.
* src/keyboard.c (decode_timer): Adjust to changes to
time decoding functions elsewhere.
* src/timefns.c: Include bignum.h, limits.h.
(FASTER_TIMEFNS): New macro.
(WARN_OBSOLETE_TIMESTAMPS, CURRENT_TIME_LIST)
(timespec_hz, trillion, ztrillion):
New constants.
(make_timeval): Use TIME_T_MAX instead of its definiens.
(check_time_validity, time_add, time_subtract):
Remove. All uses removed.
(disassemble_lisp_time): Remove; old code now folded into
decode_lisp_time. All callers changed.
(invalid_hz, s_ns_to_double, ticks_hz_list4, mpz_set_time)
(timespec_mpz, timespec_ticks, time_hz_ticks)
(lisp_time_hz_ticks, lisp_time_seconds)
(time_form_stamp, lisp_time_form_stamp, decode_ticks_hz)
(decode_lisp_time, mpz_time, list4_to_timespec):
New functions.
(decode_float_time, decode_time_components, lisp_to_timespec):
Adjust to new struct lisp_time, which does not lose
information like the old one did.
(enum timeform): New enum.
(decode_time_components): New arg FORM. All callers changed.
RESULT and DRESULT are now mutually exclusive; no callers need
to change because of this.
(decode_time_components, lisp_time_struct)
(lisp_seconds_argument, time_arith, make_lisp_time, Ffloat_time)
(Fencode_time):
Add support for (TICKS . HZ) form.
(DECODE_SECS_ONLY): New constant.
(lisp_time_struct): 2nd arg is now enum timeform, not int.
All callers changed.
(check_tm_member): Support bignums.m
(Fencode_time): Add new two-arg functionality.
* src/systime.h (struct lisp_time): Now ticks+hz rather than
hi+lo+us+ps, since ticks+hz does not lose info.
* test/src/systime-tests.el (time-equal-p-nil-nil):
New test.
2018-10-03 16:10:01 +00:00
|
|
|
X is the number of seconds since 1970-01-01 00:00:00 UTC,
|
|
|
|
ignoring leap seconds.
|
* cal-dst.el: New file.
(calendar-/, calendar-%, calendar-absolute-from-time,
calendar-time-from-absolute, calendar-next-time-zone-transition,
calendar-time-zone-daylight-rules): New functions.
(calendar-current-time-zone): Moved from calendar.el and rewritten.
(calendar-current-time-zone-cache): New variable.
(calendar-current-time-zone, calendar-time-zone,
calendar-daylight-time-offset, calendar-standard-time-zone-name,
calendar-daylight-time-zone-name,
calendar-daylight-savings-starts, calendar-daylight-savings-ends,
calendar-daylight-savings-switchover-time): Moved from calendar.el.
1993-06-22 03:25:13 +00:00
|
|
|
|
|
|
|
Returns the pair (ABS-DATE . SECONDS) where SECONDS after local midnight on
|
|
|
|
absolute date ABS-DATE is the equivalent moment to X."
|
New (TICKS . HZ) timestamp format
This follows on a suggestion by Stefan Monnier in:
https://lists.gnu.org/r/emacs-devel/2018-08/msg00991.html
(Bug#32902).
* doc/lispref/buffers.texi (Modification Time):
* doc/lispref/os.texi (Processor Run Time, Time Calculations)
* doc/lispref/processes.texi (System Processes):
* doc/lispref/text.texi (Undo):
Let the "Time of Day" section cover timestamp format details.
* doc/lispref/os.texi (Time of Day):
Say that timestamp internal format should not be assumed.
Document new (ticks . hz) format. Omit mention of seconds-to-time
since it is now just an alias for encode-time.
(Time Conversion): Document encode-time extension.
* etc/NEWS: Mention changes.
* lisp/calendar/cal-dst.el (calendar-system-time-basis): Now const.
* lisp/calendar/cal-dst.el (calendar-absolute-from-time)
(calendar-time-from-absolute)
(calendar-next-time-zone-transition):
* lisp/emacs-lisp/timer.el (timer-next-integral-multiple-of-time):
Simplify by using bignums, (TICKS . HZ), and new encode-time.
* lisp/emacs-lisp/timer.el (timer-next-integral-multiple-of-time):
Simplify by using bignums and new encode-time.
* lisp/calendar/parse-time.el (parse-iso8601-time-string):
Handle DST more accurately, by using new encode-time.
* lisp/calendar/time-date.el (seconds-to-time):
* lisp/calendar/timeclock.el (timeclock-seconds-to-time):
Now just an alias for encode-time.
* lisp/calendar/time-date.el (days-to-time):
* lisp/emacs-lisp/timer.el (timer--time-setter):
* lisp/net/ntlm.el (ntlm-compute-timestamp):
* lisp/obsolete/vc-arch.el (vc-arch-add-tagline):
* lisp/org/org-id.el (org-id-uuid, org-id-time-to-b36):
* lisp/tar-mode (tar-octal-time):
Don't assume timestamps default to list form.
* lisp/tar-mode.el (tar-parse-octal-long-integer):
Now an obsolete alias for tar-parse-octal-integer.
* src/keyboard.c (decode_timer): Adjust to changes to
time decoding functions elsewhere.
* src/timefns.c: Include bignum.h, limits.h.
(FASTER_TIMEFNS): New macro.
(WARN_OBSOLETE_TIMESTAMPS, CURRENT_TIME_LIST)
(timespec_hz, trillion, ztrillion):
New constants.
(make_timeval): Use TIME_T_MAX instead of its definiens.
(check_time_validity, time_add, time_subtract):
Remove. All uses removed.
(disassemble_lisp_time): Remove; old code now folded into
decode_lisp_time. All callers changed.
(invalid_hz, s_ns_to_double, ticks_hz_list4, mpz_set_time)
(timespec_mpz, timespec_ticks, time_hz_ticks)
(lisp_time_hz_ticks, lisp_time_seconds)
(time_form_stamp, lisp_time_form_stamp, decode_ticks_hz)
(decode_lisp_time, mpz_time, list4_to_timespec):
New functions.
(decode_float_time, decode_time_components, lisp_to_timespec):
Adjust to new struct lisp_time, which does not lose
information like the old one did.
(enum timeform): New enum.
(decode_time_components): New arg FORM. All callers changed.
RESULT and DRESULT are now mutually exclusive; no callers need
to change because of this.
(decode_time_components, lisp_time_struct)
(lisp_seconds_argument, time_arith, make_lisp_time, Ffloat_time)
(Fencode_time):
Add support for (TICKS . HZ) form.
(DECODE_SECS_ONLY): New constant.
(lisp_time_struct): 2nd arg is now enum timeform, not int.
All callers changed.
(check_tm_member): Support bignums.m
(Fencode_time): Add new two-arg functionality.
* src/systime.h (struct lisp_time): Now ticks+hz rather than
hi+lo+us+ps, since ticks+hz does not lose info.
* test/src/systime-tests.el (time-equal-p-nil-nil):
New test.
2018-10-03 16:10:01 +00:00
|
|
|
(let ((secsperday 86400)
|
|
|
|
(local (+ x utc-diff)))
|
|
|
|
(cons (+ calendar-system-time-basis (floor local secsperday))
|
|
|
|
(mod local secsperday))))
|
* cal-dst.el: New file.
(calendar-/, calendar-%, calendar-absolute-from-time,
calendar-time-from-absolute, calendar-next-time-zone-transition,
calendar-time-zone-daylight-rules): New functions.
(calendar-current-time-zone): Moved from calendar.el and rewritten.
(calendar-current-time-zone-cache): New variable.
(calendar-current-time-zone, calendar-time-zone,
calendar-daylight-time-offset, calendar-standard-time-zone-name,
calendar-daylight-time-zone-name,
calendar-daylight-savings-starts, calendar-daylight-savings-ends,
calendar-daylight-savings-switchover-time): Moved from calendar.el.
1993-06-22 03:25:13 +00:00
|
|
|
|
|
|
|
(defun calendar-time-from-absolute (abs-date s)
|
|
|
|
"Time of absolute date ABS-DATE, S seconds after midnight.
|
|
|
|
|
New (TICKS . HZ) timestamp format
This follows on a suggestion by Stefan Monnier in:
https://lists.gnu.org/r/emacs-devel/2018-08/msg00991.html
(Bug#32902).
* doc/lispref/buffers.texi (Modification Time):
* doc/lispref/os.texi (Processor Run Time, Time Calculations)
* doc/lispref/processes.texi (System Processes):
* doc/lispref/text.texi (Undo):
Let the "Time of Day" section cover timestamp format details.
* doc/lispref/os.texi (Time of Day):
Say that timestamp internal format should not be assumed.
Document new (ticks . hz) format. Omit mention of seconds-to-time
since it is now just an alias for encode-time.
(Time Conversion): Document encode-time extension.
* etc/NEWS: Mention changes.
* lisp/calendar/cal-dst.el (calendar-system-time-basis): Now const.
* lisp/calendar/cal-dst.el (calendar-absolute-from-time)
(calendar-time-from-absolute)
(calendar-next-time-zone-transition):
* lisp/emacs-lisp/timer.el (timer-next-integral-multiple-of-time):
Simplify by using bignums, (TICKS . HZ), and new encode-time.
* lisp/emacs-lisp/timer.el (timer-next-integral-multiple-of-time):
Simplify by using bignums and new encode-time.
* lisp/calendar/parse-time.el (parse-iso8601-time-string):
Handle DST more accurately, by using new encode-time.
* lisp/calendar/time-date.el (seconds-to-time):
* lisp/calendar/timeclock.el (timeclock-seconds-to-time):
Now just an alias for encode-time.
* lisp/calendar/time-date.el (days-to-time):
* lisp/emacs-lisp/timer.el (timer--time-setter):
* lisp/net/ntlm.el (ntlm-compute-timestamp):
* lisp/obsolete/vc-arch.el (vc-arch-add-tagline):
* lisp/org/org-id.el (org-id-uuid, org-id-time-to-b36):
* lisp/tar-mode (tar-octal-time):
Don't assume timestamps default to list form.
* lisp/tar-mode.el (tar-parse-octal-long-integer):
Now an obsolete alias for tar-parse-octal-integer.
* src/keyboard.c (decode_timer): Adjust to changes to
time decoding functions elsewhere.
* src/timefns.c: Include bignum.h, limits.h.
(FASTER_TIMEFNS): New macro.
(WARN_OBSOLETE_TIMESTAMPS, CURRENT_TIME_LIST)
(timespec_hz, trillion, ztrillion):
New constants.
(make_timeval): Use TIME_T_MAX instead of its definiens.
(check_time_validity, time_add, time_subtract):
Remove. All uses removed.
(disassemble_lisp_time): Remove; old code now folded into
decode_lisp_time. All callers changed.
(invalid_hz, s_ns_to_double, ticks_hz_list4, mpz_set_time)
(timespec_mpz, timespec_ticks, time_hz_ticks)
(lisp_time_hz_ticks, lisp_time_seconds)
(time_form_stamp, lisp_time_form_stamp, decode_ticks_hz)
(decode_lisp_time, mpz_time, list4_to_timespec):
New functions.
(decode_float_time, decode_time_components, lisp_to_timespec):
Adjust to new struct lisp_time, which does not lose
information like the old one did.
(enum timeform): New enum.
(decode_time_components): New arg FORM. All callers changed.
RESULT and DRESULT are now mutually exclusive; no callers need
to change because of this.
(decode_time_components, lisp_time_struct)
(lisp_seconds_argument, time_arith, make_lisp_time, Ffloat_time)
(Fencode_time):
Add support for (TICKS . HZ) form.
(DECODE_SECS_ONLY): New constant.
(lisp_time_struct): 2nd arg is now enum timeform, not int.
All callers changed.
(check_tm_member): Support bignums.m
(Fencode_time): Add new two-arg functionality.
* src/systime.h (struct lisp_time): Now ticks+hz rather than
hi+lo+us+ps, since ticks+hz does not lose info.
* test/src/systime-tests.el (time-equal-p-nil-nil):
New test.
2018-10-03 16:10:01 +00:00
|
|
|
Return the number of seconds since 1970-01-01 00:00:00 UTC,
|
|
|
|
ignoring leap seconds, that is the equivalent moment to S seconds
|
|
|
|
after midnight UTC on absolute date ABS-DATE."
|
|
|
|
(let ((secsperday 86400))
|
|
|
|
(+ s (* secsperday (- abs-date calendar-system-time-basis)))))
|
* cal-dst.el: New file.
(calendar-/, calendar-%, calendar-absolute-from-time,
calendar-time-from-absolute, calendar-next-time-zone-transition,
calendar-time-zone-daylight-rules): New functions.
(calendar-current-time-zone): Moved from calendar.el and rewritten.
(calendar-current-time-zone-cache): New variable.
(calendar-current-time-zone, calendar-time-zone,
calendar-daylight-time-offset, calendar-standard-time-zone-name,
calendar-daylight-time-zone-name,
calendar-daylight-savings-starts, calendar-daylight-savings-ends,
calendar-daylight-savings-switchover-time): Moved from calendar.el.
1993-06-22 03:25:13 +00:00
|
|
|
|
|
|
|
(defun calendar-next-time-zone-transition (time)
|
|
|
|
"Return the time of the next time zone transition after TIME.
|
2008-03-08 20:41:30 +00:00
|
|
|
Both TIME and the result are acceptable arguments to `current-time-zone'.
|
* cal-dst.el: New file.
(calendar-/, calendar-%, calendar-absolute-from-time,
calendar-time-from-absolute, calendar-next-time-zone-transition,
calendar-time-zone-daylight-rules): New functions.
(calendar-current-time-zone): Moved from calendar.el and rewritten.
(calendar-current-time-zone-cache): New variable.
(calendar-current-time-zone, calendar-time-zone,
calendar-daylight-time-offset, calendar-standard-time-zone-name,
calendar-daylight-time-zone-name,
calendar-daylight-savings-starts, calendar-daylight-savings-ends,
calendar-daylight-savings-switchover-time): Moved from calendar.el.
1993-06-22 03:25:13 +00:00
|
|
|
Return nil if no such transition can be found."
|
New (TICKS . HZ) timestamp format
This follows on a suggestion by Stefan Monnier in:
https://lists.gnu.org/r/emacs-devel/2018-08/msg00991.html
(Bug#32902).
* doc/lispref/buffers.texi (Modification Time):
* doc/lispref/os.texi (Processor Run Time, Time Calculations)
* doc/lispref/processes.texi (System Processes):
* doc/lispref/text.texi (Undo):
Let the "Time of Day" section cover timestamp format details.
* doc/lispref/os.texi (Time of Day):
Say that timestamp internal format should not be assumed.
Document new (ticks . hz) format. Omit mention of seconds-to-time
since it is now just an alias for encode-time.
(Time Conversion): Document encode-time extension.
* etc/NEWS: Mention changes.
* lisp/calendar/cal-dst.el (calendar-system-time-basis): Now const.
* lisp/calendar/cal-dst.el (calendar-absolute-from-time)
(calendar-time-from-absolute)
(calendar-next-time-zone-transition):
* lisp/emacs-lisp/timer.el (timer-next-integral-multiple-of-time):
Simplify by using bignums, (TICKS . HZ), and new encode-time.
* lisp/emacs-lisp/timer.el (timer-next-integral-multiple-of-time):
Simplify by using bignums and new encode-time.
* lisp/calendar/parse-time.el (parse-iso8601-time-string):
Handle DST more accurately, by using new encode-time.
* lisp/calendar/time-date.el (seconds-to-time):
* lisp/calendar/timeclock.el (timeclock-seconds-to-time):
Now just an alias for encode-time.
* lisp/calendar/time-date.el (days-to-time):
* lisp/emacs-lisp/timer.el (timer--time-setter):
* lisp/net/ntlm.el (ntlm-compute-timestamp):
* lisp/obsolete/vc-arch.el (vc-arch-add-tagline):
* lisp/org/org-id.el (org-id-uuid, org-id-time-to-b36):
* lisp/tar-mode (tar-octal-time):
Don't assume timestamps default to list form.
* lisp/tar-mode.el (tar-parse-octal-long-integer):
Now an obsolete alias for tar-parse-octal-integer.
* src/keyboard.c (decode_timer): Adjust to changes to
time decoding functions elsewhere.
* src/timefns.c: Include bignum.h, limits.h.
(FASTER_TIMEFNS): New macro.
(WARN_OBSOLETE_TIMESTAMPS, CURRENT_TIME_LIST)
(timespec_hz, trillion, ztrillion):
New constants.
(make_timeval): Use TIME_T_MAX instead of its definiens.
(check_time_validity, time_add, time_subtract):
Remove. All uses removed.
(disassemble_lisp_time): Remove; old code now folded into
decode_lisp_time. All callers changed.
(invalid_hz, s_ns_to_double, ticks_hz_list4, mpz_set_time)
(timespec_mpz, timespec_ticks, time_hz_ticks)
(lisp_time_hz_ticks, lisp_time_seconds)
(time_form_stamp, lisp_time_form_stamp, decode_ticks_hz)
(decode_lisp_time, mpz_time, list4_to_timespec):
New functions.
(decode_float_time, decode_time_components, lisp_to_timespec):
Adjust to new struct lisp_time, which does not lose
information like the old one did.
(enum timeform): New enum.
(decode_time_components): New arg FORM. All callers changed.
RESULT and DRESULT are now mutually exclusive; no callers need
to change because of this.
(decode_time_components, lisp_time_struct)
(lisp_seconds_argument, time_arith, make_lisp_time, Ffloat_time)
(Fencode_time):
Add support for (TICKS . HZ) form.
(DECODE_SECS_ONLY): New constant.
(lisp_time_struct): 2nd arg is now enum timeform, not int.
All callers changed.
(check_tm_member): Support bignums.m
(Fencode_time): Add new two-arg functionality.
* src/systime.h (struct lisp_time): Now ticks+hz rather than
hi+lo+us+ps, since ticks+hz does not lose info.
* test/src/systime-tests.el (time-equal-p-nil-nil):
New test.
2018-10-03 16:10:01 +00:00
|
|
|
(let* ((time (encode-time time 'integer))
|
2008-03-13 06:29:28 +00:00
|
|
|
(time-zone (current-time-zone time))
|
|
|
|
(time-utc-diff (car time-zone))
|
* cal-dst.el: New file.
(calendar-/, calendar-%, calendar-absolute-from-time,
calendar-time-from-absolute, calendar-next-time-zone-transition,
calendar-time-zone-daylight-rules): New functions.
(calendar-current-time-zone): Moved from calendar.el and rewritten.
(calendar-current-time-zone-cache): New variable.
(calendar-current-time-zone, calendar-time-zone,
calendar-daylight-time-offset, calendar-standard-time-zone-name,
calendar-daylight-time-zone-name,
calendar-daylight-savings-starts, calendar-daylight-savings-ends,
calendar-daylight-savings-switchover-time): Moved from calendar.el.
1993-06-22 03:25:13 +00:00
|
|
|
hi
|
2008-03-13 06:29:28 +00:00
|
|
|
hi-zone
|
* cal-dst.el: New file.
(calendar-/, calendar-%, calendar-absolute-from-time,
calendar-time-from-absolute, calendar-next-time-zone-transition,
calendar-time-zone-daylight-rules): New functions.
(calendar-current-time-zone): Moved from calendar.el and rewritten.
(calendar-current-time-zone-cache): New variable.
(calendar-current-time-zone, calendar-time-zone,
calendar-daylight-time-offset, calendar-standard-time-zone-name,
calendar-daylight-time-zone-name,
calendar-daylight-savings-starts, calendar-daylight-savings-ends,
calendar-daylight-savings-switchover-time): Moved from calendar.el.
1993-06-22 03:25:13 +00:00
|
|
|
(hi-utc-diff time-utc-diff)
|
New (TICKS . HZ) timestamp format
This follows on a suggestion by Stefan Monnier in:
https://lists.gnu.org/r/emacs-devel/2018-08/msg00991.html
(Bug#32902).
* doc/lispref/buffers.texi (Modification Time):
* doc/lispref/os.texi (Processor Run Time, Time Calculations)
* doc/lispref/processes.texi (System Processes):
* doc/lispref/text.texi (Undo):
Let the "Time of Day" section cover timestamp format details.
* doc/lispref/os.texi (Time of Day):
Say that timestamp internal format should not be assumed.
Document new (ticks . hz) format. Omit mention of seconds-to-time
since it is now just an alias for encode-time.
(Time Conversion): Document encode-time extension.
* etc/NEWS: Mention changes.
* lisp/calendar/cal-dst.el (calendar-system-time-basis): Now const.
* lisp/calendar/cal-dst.el (calendar-absolute-from-time)
(calendar-time-from-absolute)
(calendar-next-time-zone-transition):
* lisp/emacs-lisp/timer.el (timer-next-integral-multiple-of-time):
Simplify by using bignums, (TICKS . HZ), and new encode-time.
* lisp/emacs-lisp/timer.el (timer-next-integral-multiple-of-time):
Simplify by using bignums and new encode-time.
* lisp/calendar/parse-time.el (parse-iso8601-time-string):
Handle DST more accurately, by using new encode-time.
* lisp/calendar/time-date.el (seconds-to-time):
* lisp/calendar/timeclock.el (timeclock-seconds-to-time):
Now just an alias for encode-time.
* lisp/calendar/time-date.el (days-to-time):
* lisp/emacs-lisp/timer.el (timer--time-setter):
* lisp/net/ntlm.el (ntlm-compute-timestamp):
* lisp/obsolete/vc-arch.el (vc-arch-add-tagline):
* lisp/org/org-id.el (org-id-uuid, org-id-time-to-b36):
* lisp/tar-mode (tar-octal-time):
Don't assume timestamps default to list form.
* lisp/tar-mode.el (tar-parse-octal-long-integer):
Now an obsolete alias for tar-parse-octal-integer.
* src/keyboard.c (decode_timer): Adjust to changes to
time decoding functions elsewhere.
* src/timefns.c: Include bignum.h, limits.h.
(FASTER_TIMEFNS): New macro.
(WARN_OBSOLETE_TIMESTAMPS, CURRENT_TIME_LIST)
(timespec_hz, trillion, ztrillion):
New constants.
(make_timeval): Use TIME_T_MAX instead of its definiens.
(check_time_validity, time_add, time_subtract):
Remove. All uses removed.
(disassemble_lisp_time): Remove; old code now folded into
decode_lisp_time. All callers changed.
(invalid_hz, s_ns_to_double, ticks_hz_list4, mpz_set_time)
(timespec_mpz, timespec_ticks, time_hz_ticks)
(lisp_time_hz_ticks, lisp_time_seconds)
(time_form_stamp, lisp_time_form_stamp, decode_ticks_hz)
(decode_lisp_time, mpz_time, list4_to_timespec):
New functions.
(decode_float_time, decode_time_components, lisp_to_timespec):
Adjust to new struct lisp_time, which does not lose
information like the old one did.
(enum timeform): New enum.
(decode_time_components): New arg FORM. All callers changed.
RESULT and DRESULT are now mutually exclusive; no callers need
to change because of this.
(decode_time_components, lisp_time_struct)
(lisp_seconds_argument, time_arith, make_lisp_time, Ffloat_time)
(Fencode_time):
Add support for (TICKS . HZ) form.
(DECODE_SECS_ONLY): New constant.
(lisp_time_struct): 2nd arg is now enum timeform, not int.
All callers changed.
(check_tm_member): Support bignums.m
(Fencode_time): Add new two-arg functionality.
* src/systime.h (struct lisp_time): Now ticks+hz rather than
hi+lo+us+ps, since ticks+hz does not lose info.
* test/src/systime-tests.el (time-equal-p-nil-nil):
New test.
2018-10-03 16:10:01 +00:00
|
|
|
(quarter-seconds 7889238) ; Average seconds per 1/4 Gregorian year.
|
* cal-dst.el: New file.
(calendar-/, calendar-%, calendar-absolute-from-time,
calendar-time-from-absolute, calendar-next-time-zone-transition,
calendar-time-zone-daylight-rules): New functions.
(calendar-current-time-zone): Moved from calendar.el and rewritten.
(calendar-current-time-zone-cache): New variable.
(calendar-current-time-zone, calendar-time-zone,
calendar-daylight-time-offset, calendar-standard-time-zone-name,
calendar-daylight-time-zone-name,
calendar-daylight-savings-starts, calendar-daylight-savings-ends,
calendar-daylight-savings-switchover-time): Moved from calendar.el.
1993-06-22 03:25:13 +00:00
|
|
|
(quarters '(2 1 3)))
|
|
|
|
;; Heuristic: probe the time zone offset in the next three calendar
|
|
|
|
;; quarters, looking for a time zone offset different from TIME.
|
|
|
|
(while (and quarters (eq time-utc-diff hi-utc-diff))
|
New (TICKS . HZ) timestamp format
This follows on a suggestion by Stefan Monnier in:
https://lists.gnu.org/r/emacs-devel/2018-08/msg00991.html
(Bug#32902).
* doc/lispref/buffers.texi (Modification Time):
* doc/lispref/os.texi (Processor Run Time, Time Calculations)
* doc/lispref/processes.texi (System Processes):
* doc/lispref/text.texi (Undo):
Let the "Time of Day" section cover timestamp format details.
* doc/lispref/os.texi (Time of Day):
Say that timestamp internal format should not be assumed.
Document new (ticks . hz) format. Omit mention of seconds-to-time
since it is now just an alias for encode-time.
(Time Conversion): Document encode-time extension.
* etc/NEWS: Mention changes.
* lisp/calendar/cal-dst.el (calendar-system-time-basis): Now const.
* lisp/calendar/cal-dst.el (calendar-absolute-from-time)
(calendar-time-from-absolute)
(calendar-next-time-zone-transition):
* lisp/emacs-lisp/timer.el (timer-next-integral-multiple-of-time):
Simplify by using bignums, (TICKS . HZ), and new encode-time.
* lisp/emacs-lisp/timer.el (timer-next-integral-multiple-of-time):
Simplify by using bignums and new encode-time.
* lisp/calendar/parse-time.el (parse-iso8601-time-string):
Handle DST more accurately, by using new encode-time.
* lisp/calendar/time-date.el (seconds-to-time):
* lisp/calendar/timeclock.el (timeclock-seconds-to-time):
Now just an alias for encode-time.
* lisp/calendar/time-date.el (days-to-time):
* lisp/emacs-lisp/timer.el (timer--time-setter):
* lisp/net/ntlm.el (ntlm-compute-timestamp):
* lisp/obsolete/vc-arch.el (vc-arch-add-tagline):
* lisp/org/org-id.el (org-id-uuid, org-id-time-to-b36):
* lisp/tar-mode (tar-octal-time):
Don't assume timestamps default to list form.
* lisp/tar-mode.el (tar-parse-octal-long-integer):
Now an obsolete alias for tar-parse-octal-integer.
* src/keyboard.c (decode_timer): Adjust to changes to
time decoding functions elsewhere.
* src/timefns.c: Include bignum.h, limits.h.
(FASTER_TIMEFNS): New macro.
(WARN_OBSOLETE_TIMESTAMPS, CURRENT_TIME_LIST)
(timespec_hz, trillion, ztrillion):
New constants.
(make_timeval): Use TIME_T_MAX instead of its definiens.
(check_time_validity, time_add, time_subtract):
Remove. All uses removed.
(disassemble_lisp_time): Remove; old code now folded into
decode_lisp_time. All callers changed.
(invalid_hz, s_ns_to_double, ticks_hz_list4, mpz_set_time)
(timespec_mpz, timespec_ticks, time_hz_ticks)
(lisp_time_hz_ticks, lisp_time_seconds)
(time_form_stamp, lisp_time_form_stamp, decode_ticks_hz)
(decode_lisp_time, mpz_time, list4_to_timespec):
New functions.
(decode_float_time, decode_time_components, lisp_to_timespec):
Adjust to new struct lisp_time, which does not lose
information like the old one did.
(enum timeform): New enum.
(decode_time_components): New arg FORM. All callers changed.
RESULT and DRESULT are now mutually exclusive; no callers need
to change because of this.
(decode_time_components, lisp_time_struct)
(lisp_seconds_argument, time_arith, make_lisp_time, Ffloat_time)
(Fencode_time):
Add support for (TICKS . HZ) form.
(DECODE_SECS_ONLY): New constant.
(lisp_time_struct): 2nd arg is now enum timeform, not int.
All callers changed.
(check_tm_member): Support bignums.m
(Fencode_time): Add new two-arg functionality.
* src/systime.h (struct lisp_time): Now ticks+hz rather than
hi+lo+us+ps, since ticks+hz does not lose info.
* test/src/systime-tests.el (time-equal-p-nil-nil):
New test.
2018-10-03 16:10:01 +00:00
|
|
|
(setq hi (+ time (* (car quarters) quarter-seconds))
|
2008-03-14 03:38:38 +00:00
|
|
|
hi-zone (current-time-zone hi)
|
|
|
|
hi-utc-diff (car hi-zone)
|
|
|
|
quarters (cdr quarters)))
|
* cal-dst.el: New file.
(calendar-/, calendar-%, calendar-absolute-from-time,
calendar-time-from-absolute, calendar-next-time-zone-transition,
calendar-time-zone-daylight-rules): New functions.
(calendar-current-time-zone): Moved from calendar.el and rewritten.
(calendar-current-time-zone-cache): New variable.
(calendar-current-time-zone, calendar-time-zone,
calendar-daylight-time-offset, calendar-standard-time-zone-name,
calendar-daylight-time-zone-name,
calendar-daylight-savings-starts, calendar-daylight-savings-ends,
calendar-daylight-savings-switchover-time): Moved from calendar.el.
1993-06-22 03:25:13 +00:00
|
|
|
(and
|
|
|
|
time-utc-diff
|
|
|
|
hi-utc-diff
|
|
|
|
(not (eq time-utc-diff hi-utc-diff))
|
|
|
|
;; Now HI is after the next time zone transition.
|
|
|
|
;; Set LO to TIME, and then binary search to increase LO and decrease HI
|
|
|
|
;; until LO is just before and HI is just after the time zone transition.
|
New (TICKS . HZ) timestamp format
This follows on a suggestion by Stefan Monnier in:
https://lists.gnu.org/r/emacs-devel/2018-08/msg00991.html
(Bug#32902).
* doc/lispref/buffers.texi (Modification Time):
* doc/lispref/os.texi (Processor Run Time, Time Calculations)
* doc/lispref/processes.texi (System Processes):
* doc/lispref/text.texi (Undo):
Let the "Time of Day" section cover timestamp format details.
* doc/lispref/os.texi (Time of Day):
Say that timestamp internal format should not be assumed.
Document new (ticks . hz) format. Omit mention of seconds-to-time
since it is now just an alias for encode-time.
(Time Conversion): Document encode-time extension.
* etc/NEWS: Mention changes.
* lisp/calendar/cal-dst.el (calendar-system-time-basis): Now const.
* lisp/calendar/cal-dst.el (calendar-absolute-from-time)
(calendar-time-from-absolute)
(calendar-next-time-zone-transition):
* lisp/emacs-lisp/timer.el (timer-next-integral-multiple-of-time):
Simplify by using bignums, (TICKS . HZ), and new encode-time.
* lisp/emacs-lisp/timer.el (timer-next-integral-multiple-of-time):
Simplify by using bignums and new encode-time.
* lisp/calendar/parse-time.el (parse-iso8601-time-string):
Handle DST more accurately, by using new encode-time.
* lisp/calendar/time-date.el (seconds-to-time):
* lisp/calendar/timeclock.el (timeclock-seconds-to-time):
Now just an alias for encode-time.
* lisp/calendar/time-date.el (days-to-time):
* lisp/emacs-lisp/timer.el (timer--time-setter):
* lisp/net/ntlm.el (ntlm-compute-timestamp):
* lisp/obsolete/vc-arch.el (vc-arch-add-tagline):
* lisp/org/org-id.el (org-id-uuid, org-id-time-to-b36):
* lisp/tar-mode (tar-octal-time):
Don't assume timestamps default to list form.
* lisp/tar-mode.el (tar-parse-octal-long-integer):
Now an obsolete alias for tar-parse-octal-integer.
* src/keyboard.c (decode_timer): Adjust to changes to
time decoding functions elsewhere.
* src/timefns.c: Include bignum.h, limits.h.
(FASTER_TIMEFNS): New macro.
(WARN_OBSOLETE_TIMESTAMPS, CURRENT_TIME_LIST)
(timespec_hz, trillion, ztrillion):
New constants.
(make_timeval): Use TIME_T_MAX instead of its definiens.
(check_time_validity, time_add, time_subtract):
Remove. All uses removed.
(disassemble_lisp_time): Remove; old code now folded into
decode_lisp_time. All callers changed.
(invalid_hz, s_ns_to_double, ticks_hz_list4, mpz_set_time)
(timespec_mpz, timespec_ticks, time_hz_ticks)
(lisp_time_hz_ticks, lisp_time_seconds)
(time_form_stamp, lisp_time_form_stamp, decode_ticks_hz)
(decode_lisp_time, mpz_time, list4_to_timespec):
New functions.
(decode_float_time, decode_time_components, lisp_to_timespec):
Adjust to new struct lisp_time, which does not lose
information like the old one did.
(enum timeform): New enum.
(decode_time_components): New arg FORM. All callers changed.
RESULT and DRESULT are now mutually exclusive; no callers need
to change because of this.
(decode_time_components, lisp_time_struct)
(lisp_seconds_argument, time_arith, make_lisp_time, Ffloat_time)
(Fencode_time):
Add support for (TICKS . HZ) form.
(DECODE_SECS_ONLY): New constant.
(lisp_time_struct): 2nd arg is now enum timeform, not int.
All callers changed.
(check_tm_member): Support bignums.m
(Fencode_time): Add new two-arg functionality.
* src/systime.h (struct lisp_time): Now ticks+hz rather than
hi+lo+us+ps, since ticks+hz does not lose info.
* test/src/systime-tests.el (time-equal-p-nil-nil):
New test.
2018-10-03 16:10:01 +00:00
|
|
|
(let* ((lo time)
|
2008-03-13 06:29:28 +00:00
|
|
|
probe)
|
* cal-dst.el: New file.
(calendar-/, calendar-%, calendar-absolute-from-time,
calendar-time-from-absolute, calendar-next-time-zone-transition,
calendar-time-zone-daylight-rules): New functions.
(calendar-current-time-zone): Moved from calendar.el and rewritten.
(calendar-current-time-zone-cache): New variable.
(calendar-current-time-zone, calendar-time-zone,
calendar-daylight-time-offset, calendar-standard-time-zone-name,
calendar-daylight-time-zone-name,
calendar-daylight-savings-starts, calendar-daylight-savings-ends,
calendar-daylight-savings-switchover-time): Moved from calendar.el.
1993-06-22 03:25:13 +00:00
|
|
|
(while
|
2008-03-13 06:29:28 +00:00
|
|
|
;; Set PROBE to halfway between LO and HI, rounding down.
|
|
|
|
;; If PROBE equals LO, we are done.
|
2018-11-14 19:42:59 +00:00
|
|
|
(not (= lo (setq probe (floor (+ lo hi) 2))))
|
2008-03-13 06:29:28 +00:00
|
|
|
;; Set either LO or HI to PROBE, depending on probe results.
|
|
|
|
(if (eq (car (current-time-zone probe)) hi-utc-diff)
|
|
|
|
(setq hi probe)
|
|
|
|
(setq lo probe)))
|
* cal-dst.el: New file.
(calendar-/, calendar-%, calendar-absolute-from-time,
calendar-time-from-absolute, calendar-next-time-zone-transition,
calendar-time-zone-daylight-rules): New functions.
(calendar-current-time-zone): Moved from calendar.el and rewritten.
(calendar-current-time-zone-cache): New variable.
(calendar-current-time-zone, calendar-time-zone,
calendar-daylight-time-offset, calendar-standard-time-zone-name,
calendar-daylight-time-zone-name,
calendar-daylight-savings-starts, calendar-daylight-savings-ends,
calendar-daylight-savings-switchover-time): Moved from calendar.el.
1993-06-22 03:25:13 +00:00
|
|
|
hi))))
|
|
|
|
|
2008-04-04 07:37:36 +00:00
|
|
|
(autoload 'calendar-persian-to-absolute "cal-persia")
|
2008-03-26 03:10:23 +00:00
|
|
|
|
* cal-dst.el: New file.
(calendar-/, calendar-%, calendar-absolute-from-time,
calendar-time-from-absolute, calendar-next-time-zone-transition,
calendar-time-zone-daylight-rules): New functions.
(calendar-current-time-zone): Moved from calendar.el and rewritten.
(calendar-current-time-zone-cache): New variable.
(calendar-current-time-zone, calendar-time-zone,
calendar-daylight-time-offset, calendar-standard-time-zone-name,
calendar-daylight-time-zone-name,
calendar-daylight-savings-starts, calendar-daylight-savings-ends,
calendar-daylight-savings-switchover-time): Moved from calendar.el.
1993-06-22 03:25:13 +00:00
|
|
|
(defun calendar-time-zone-daylight-rules (abs-date utc-diff)
|
|
|
|
"Return daylight transition rule for ABS-DATE, UTC-DIFF sec offset from UTC.
|
2007-03-17 17:49:59 +00:00
|
|
|
ABS-DATE must specify a day that contains a daylight saving transition.
|
|
|
|
The result has the proper form for `calendar-daylight-savings-starts'."
|
* cal-dst.el: New file.
(calendar-/, calendar-%, calendar-absolute-from-time,
calendar-time-from-absolute, calendar-next-time-zone-transition,
calendar-time-zone-daylight-rules): New functions.
(calendar-current-time-zone): Moved from calendar.el and rewritten.
(calendar-current-time-zone-cache): New variable.
(calendar-current-time-zone, calendar-time-zone,
calendar-daylight-time-offset, calendar-standard-time-zone-name,
calendar-daylight-time-zone-name,
calendar-daylight-savings-starts, calendar-daylight-savings-ends,
calendar-daylight-savings-switchover-time): Moved from calendar.el.
1993-06-22 03:25:13 +00:00
|
|
|
(let* ((date (calendar-gregorian-from-absolute abs-date))
|
2008-03-13 06:29:28 +00:00
|
|
|
(weekday (% abs-date 7))
|
2008-04-07 01:59:37 +00:00
|
|
|
(m (calendar-extract-month date))
|
|
|
|
(d (calendar-extract-day date))
|
|
|
|
(y (calendar-extract-year date))
|
* cal-dst.el: New file.
(calendar-/, calendar-%, calendar-absolute-from-time,
calendar-time-from-absolute, calendar-next-time-zone-transition,
calendar-time-zone-daylight-rules): New functions.
(calendar-current-time-zone): Moved from calendar.el and rewritten.
(calendar-current-time-zone-cache): New variable.
(calendar-current-time-zone, calendar-time-zone,
calendar-daylight-time-offset, calendar-standard-time-zone-name,
calendar-daylight-time-zone-name,
calendar-daylight-savings-starts, calendar-daylight-savings-ends,
calendar-daylight-savings-switchover-time): Moved from calendar.el.
1993-06-22 03:25:13 +00:00
|
|
|
(last (calendar-last-day-of-month m y))
|
2008-04-02 03:18:55 +00:00
|
|
|
j rlist
|
|
|
|
(candidate-rules ; these return Gregorian dates
|
2008-03-13 06:29:28 +00:00
|
|
|
(append
|
|
|
|
;; Day D of month M.
|
2008-04-02 03:18:55 +00:00
|
|
|
`((list ,m ,d year))
|
2008-03-13 06:29:28 +00:00
|
|
|
;; The first WEEKDAY of month M.
|
* cal-dst.el: New file.
(calendar-/, calendar-%, calendar-absolute-from-time,
calendar-time-from-absolute, calendar-next-time-zone-transition,
calendar-time-zone-daylight-rules): New functions.
(calendar-current-time-zone): Moved from calendar.el and rewritten.
(calendar-current-time-zone-cache): New variable.
(calendar-current-time-zone, calendar-time-zone,
calendar-daylight-time-offset, calendar-standard-time-zone-name,
calendar-daylight-time-zone-name,
calendar-daylight-savings-starts, calendar-daylight-savings-ends,
calendar-daylight-savings-switchover-time): Moved from calendar.el.
1993-06-22 03:25:13 +00:00
|
|
|
(if (< d 8)
|
2008-04-02 03:18:55 +00:00
|
|
|
`((calendar-nth-named-day 1 ,weekday ,m year)))
|
2008-03-13 06:29:28 +00:00
|
|
|
;; The last WEEKDAY of month M.
|
* cal-dst.el: New file.
(calendar-/, calendar-%, calendar-absolute-from-time,
calendar-time-from-absolute, calendar-next-time-zone-transition,
calendar-time-zone-daylight-rules): New functions.
(calendar-current-time-zone): Moved from calendar.el and rewritten.
(calendar-current-time-zone-cache): New variable.
(calendar-current-time-zone, calendar-time-zone,
calendar-daylight-time-offset, calendar-standard-time-zone-name,
calendar-daylight-time-zone-name,
calendar-daylight-savings-starts, calendar-daylight-savings-ends,
calendar-daylight-savings-switchover-time): Moved from calendar.el.
1993-06-22 03:25:13 +00:00
|
|
|
(if (> d (- last 7))
|
2008-04-02 03:18:55 +00:00
|
|
|
`((calendar-nth-named-day -1 ,weekday ,m year)))
|
|
|
|
(progn
|
|
|
|
;; The first WEEKDAY after day J of month M, for D-6 < J <= D.
|
|
|
|
(setq j (1- (max 2 (- d 6))))
|
|
|
|
(while (<= (setq j (1+ j)) (min d (- last 8)))
|
|
|
|
(push `(calendar-nth-named-day 1 ,weekday ,m year ,j) rlist))
|
|
|
|
rlist)
|
2008-03-13 06:29:28 +00:00
|
|
|
;; 01-01 and 07-01 for this year's Persian calendar.
|
2008-04-02 03:18:55 +00:00
|
|
|
;; FIXME what does the Persian calendar have to do with this?
|
2009-06-23 07:30:25 +00:00
|
|
|
(and (= m 3) (memq d '(20 21))
|
|
|
|
'((calendar-gregorian-from-absolute
|
|
|
|
(calendar-persian-to-absolute `(1 1 ,(- year 621))))))
|
|
|
|
(and (= m 9) (memq d '(22 23))
|
|
|
|
'((calendar-gregorian-from-absolute
|
|
|
|
(calendar-persian-to-absolute `(7 1 ,(- year 621))))))))
|
2008-03-15 02:58:24 +00:00
|
|
|
(prevday-sec (- -1 utc-diff)) ; last sec of previous local day
|
2008-04-02 03:18:55 +00:00
|
|
|
new-rules)
|
2017-12-04 20:50:14 +00:00
|
|
|
(calendar-dlet* ((year (1+ y)))
|
|
|
|
;; Scan through the next few years until only one rule remains.
|
|
|
|
(while (cdr candidate-rules)
|
|
|
|
(dolist (rule candidate-rules)
|
|
|
|
;; The rule we return should give a Gregorian date, but here
|
|
|
|
;; we require an absolute date. The following is for efficiency.
|
|
|
|
(setq date (cond ((eq (car rule) #'calendar-nth-named-day)
|
|
|
|
(eval (cons #'calendar-nth-named-absday
|
|
|
|
(cdr rule))))
|
|
|
|
((eq (car rule) #'calendar-gregorian-from-absolute)
|
|
|
|
(eval (cadr rule)))
|
|
|
|
(t (calendar-absolute-from-gregorian (eval rule)))))
|
|
|
|
(or (equal (current-time-zone
|
|
|
|
(calendar-time-from-absolute date prevday-sec))
|
|
|
|
(current-time-zone
|
|
|
|
(calendar-time-from-absolute (1+ date) prevday-sec)))
|
|
|
|
(setq new-rules (cons rule new-rules))))
|
|
|
|
;; If no rules remain, just use the first candidate rule;
|
|
|
|
;; it's wrong in general, but it's right for at least one year.
|
|
|
|
(setq candidate-rules (if new-rules (nreverse new-rules)
|
|
|
|
(list (car candidate-rules)))
|
|
|
|
new-rules nil
|
|
|
|
year (1+ year))))
|
(calendar-time-zone-daylight-rules): Scan through the
next few years until at most one rule remains; if none remain, then
just use the first candidate rule; it's wrong in general, but it's
right for at least one year. This is a better heuristic in case the
underlying time zone implementation has bugs (which is all too
common). If possible, don't convert back and forth between gregorian
and absolute; this speeds things up noticeably. This uses the new
calendar-nth-named-absday function.
(calendar-current-time-zone): Some locales start DST at a different
time of day than they end; allow for this by yielding both times. The
performance speedups in calendar.el are great enough that we now no
longer need the "Checking time zone data..." message. If
current-time-zone yields nil, don't bother with
calendar-next-time-zone-transition. Use clearer names for local vars.
(calendar-time-zone, calendar-daylight-time-offset,
calendar-{standard,daylight}-time-zone-name,
calendar-daylight-savings-{starts,ends}): Default to US Eastern rules
for information that is not available.
(calendar-daylight-savings-{starts,ends}-time): New vars, replacing
calendar-daylight-savings-switchover-time, to support locales that
start DST at a different time of day than they end.
(calendar-absolute-from-time):
Fix typo by interchanging floor and mod.
1993-08-28 04:14:25 +00:00
|
|
|
(car candidate-rules)))
|
* cal-dst.el: New file.
(calendar-/, calendar-%, calendar-absolute-from-time,
calendar-time-from-absolute, calendar-next-time-zone-transition,
calendar-time-zone-daylight-rules): New functions.
(calendar-current-time-zone): Moved from calendar.el and rewritten.
(calendar-current-time-zone-cache): New variable.
(calendar-current-time-zone, calendar-time-zone,
calendar-daylight-time-offset, calendar-standard-time-zone-name,
calendar-daylight-time-zone-name,
calendar-daylight-savings-starts, calendar-daylight-savings-ends,
calendar-daylight-savings-switchover-time): Moved from calendar.el.
1993-06-22 03:25:13 +00:00
|
|
|
|
2006-11-10 08:54:38 +00:00
|
|
|
;; TODO it might be better to extract this information directly from
|
|
|
|
;; the system timezone database. But cross-platform...?
|
|
|
|
;; See thread
|
2017-11-26 06:45:41 +00:00
|
|
|
;; https://lists.gnu.org/r/emacs-pretest-bug/2006-11/msg00060.html
|
2006-11-10 08:54:38 +00:00
|
|
|
(defun calendar-dst-find-data (&optional time)
|
2007-03-17 17:49:59 +00:00
|
|
|
"Find data on the first daylight saving time transitions after TIME.
|
Avoid some double-rounding of Lisp timestamps
Also, simplify some time-related Lisp timestamp code
while we’re in the neighborhood.
* lisp/battery.el (battery-linux-proc-acpi)
(battery-linux-sysfs, battery-upower, battery-bsd-apm):
* lisp/calendar/timeclock.el (timeclock-seconds-to-string)
(timeclock-log, timeclock-last-period)
(timeclock-entry-length, timeclock-entry-list-span)
(timeclock-find-discrep, timeclock-generate-report):
* lisp/cedet/ede/detect.el (ede-detect-qtest):
* lisp/completion.el (cmpl-hours-since-origin):
* lisp/ecomplete.el (ecomplete-decay-1):
* lisp/emacs-lisp/ert.el (ert--results-update-stats-display)
(ert--results-update-stats-display-maybe):
* lisp/emacs-lisp/timer-list.el (list-timers):
* lisp/emacs-lisp/timer.el (timer-until)
(timer-event-handler):
* lisp/erc/erc-backend.el (erc-server-send-ping)
(erc-server-send-queue, erc-handle-parsed-server-response)
(erc-handle-unknown-server-response):
* lisp/erc/erc-track.el (erc-buffer-visible):
* lisp/erc/erc.el (erc-lurker-cleanup, erc-lurker-p)
(erc-cmd-PING, erc-send-current-line):
* lisp/eshell/em-pred.el (eshell-pred-file-time):
* lisp/eshell/em-unix.el (eshell-show-elapsed-time):
* lisp/gnus/gnus-icalendar.el (gnus-icalendar-event:org-timestamp):
* lisp/gnus/gnus-int.el (gnus-backend-trace):
* lisp/gnus/gnus-sum.el (gnus-user-date):
* lisp/gnus/mail-source.el (mail-source-delete-crash-box):
* lisp/gnus/nnmaildir.el (nnmaildir--scan):
* lisp/ibuf-ext.el (ibuffer-mark-old-buffers):
* lisp/gnus/nnmaildir.el (nnmaildir--scan):
* lisp/mouse.el (mouse--down-1-maybe-follows-link)
(mouse--click-1-maybe-follows-link):
* lisp/mpc.el (mpc--faster-toggle):
* lisp/net/rcirc.el (rcirc-handler-ctcp-KEEPALIVE)
(rcirc-sentinel):
* lisp/net/tramp-cache.el (tramp-get-file-property):
* lisp/net/tramp-sh.el (tramp-sh-handle-file-newer-than-file-p)
(tramp-maybe-open-connection):
* lisp/net/tramp-smb.el (tramp-smb-maybe-open-connection):
* lisp/org/org-clock.el (org-clock-resolve):
(org-resolve-clocks, org-clock-in, org-clock-out, org-clock-sum):
* lisp/org/org-timer.el (org-timer-start)
(org-timer-pause-or-continue, org-timer-seconds):
* lisp/org/org.el (org-evaluate-time-range):
* lisp/org/ox-publish.el (org-publish-cache-ctime-of-src):
* lisp/pixel-scroll.el (pixel-scroll-in-rush-p):
* lisp/play/hanoi.el (hanoi-move-ring):
* lisp/proced.el (proced-format-time):
* lisp/progmodes/cpp.el (cpp-progress-message):
* lisp/progmodes/flymake.el (flymake--handle-report):
* lisp/progmodes/js.el (js--wait-for-matching-output):
* lisp/subr.el (progress-reporter-do-update):
* lisp/term/xterm.el (xterm--read-event-for-query):
* lisp/time.el (display-time-update, emacs-uptime):
* lisp/tooltip.el (tooltip-delay):
* lisp/url/url-cookie.el (url-cookie-parse-file-netscape):
* lisp/url/url-queue.el (url-queue-prune-old-entries):
* lisp/url/url.el (url-retrieve-synchronously):
* lisp/xt-mouse.el (xterm-mouse-event):
Avoid double-rounding of time-related values. Simplify.
* lisp/calendar/icalendar.el (icalendar--decode-isodatetime):
When hoping for the best (unlikely), use a better decoded time.
(icalendar--convert-sexp-to-ical): Avoid unnecessary encode-time.
* lisp/calendar/timeclock.el (timeclock-when-to-leave):
* lisp/cedet/ede/detect.el (ede-detect-qtest):
* lisp/desktop.el (desktop-create-buffer):
* lisp/emacs-lisp/benchmark.el (benchmark-elapse):
* lisp/gnus/gnus-art.el (article-lapsed-string):
* lisp/gnus/gnus-group.el (gnus-group-timestamp-delta):
* lisp/gnus/nnmail.el (nnmail-expired-article-p):
* lisp/gnus/nnmaildir.el (nnmaildir-request-expire-articles):
* lisp/nxml/rng-maint.el (rng-time-function):
* lisp/org/org-clock.el (org-clock-get-clocked-time)
(org-clock-resolve, org-resolve-clocks, org-resolve-clocks-if-idle):
* lisp/org/org-habit.el (org-habit-insert-consistency-graphs):
* lisp/progmodes/vhdl-mode.el (vhdl-update-progress-info)
(vhdl-fix-case-region-1):
Use time-since instead of open-coding most of it.
* lisp/erc/erc-dcc.el (erc-dcc-get-sentinel):
* lisp/erc/erc.el (erc-string-to-emacs-time, erc-time-gt):
Now obsolete. All uses changed.
(erc-time-diff): Accept all Lisp time values.
All uses changed.
* lisp/gnus/gnus-demon.el (gnus-demon-idle-since):
* lisp/gnus/gnus-score.el (gnus-score-headers):
* lisp/gnus/nneething.el (nneething-make-head):
* lisp/gnus/nnheader.el (nnheader-message-maybe):
* lisp/gnus/nnimap.el (nnimap-keepalive):
* lisp/image.el (image-animate-timeout):
* lisp/mail/feedmail.el (feedmail-rfc822-date):
* lisp/net/imap.el (imap-wait-for-tag):
* lisp/net/newst-backend.el (newsticker--image-get):
* lisp/net/rcirc.el (rcirc-handler-317, rcirc-handler-333):
* lisp/obsolete/xesam.el (xesam-refresh-entry):
* lisp/org/org-agenda.el (org-agenda-show-clocking-issues)
(org-agenda-check-clock-gap, org-agenda-to-appt):
* lisp/org/org-capture.el (org-capture-set-target-location):
* lisp/org/org-clock.el (org-clock-resolve-clock)
(org-clocktable-steps):
* lisp/org/org-colview.el (org-columns-edit-value)
(org-columns, org-agenda-columns):
* lisp/org/org-duration.el (org-duration-from-minutes):
* lisp/org/org-element.el (org-element-cache-sync-duration)
(org-element-cache-sync-break)
(org-element--cache-interrupt-p, org-element--cache-sync):
* lisp/org/org-habit.el (org-habit-get-faces)
* lisp/org/org-indent.el (org-indent-add-properties):
* lisp/org/org-table.el (org-table-sum):
* lisp/org/org-timer.el (org-timer-show-remaining-time)
(org-timer-set-timer):
* lisp/org/org.el (org-babel-load-file, org-today)
(org-auto-repeat-maybe, org-2ft, org-time-stamp)
(org-read-date-analyze, org-time-stamp-to-now)
(org-small-year-to-year, org-goto-calendar):
* lisp/org/ox.el (org-export-insert-default-template):
* lisp/ses.el (ses--time-check):
* lisp/type-break.el (type-break-time-warning)
(type-break-statistics, type-break-demo-boring):
* lisp/url/url-cache.el (url-cache-expired)
(url-cache-prune-cache):
* lisp/vc/vc-git.el (vc-git-stash-snapshot):
* lisp/erc/erc-match.el (erc-log-matches-come-back):
Simplify.
2019-02-23 02:32:31 +00:00
|
|
|
TIME defaults to the current time. Return value is as described
|
2006-11-10 08:54:38 +00:00
|
|
|
for `calendar-current-time-zone'."
|
|
|
|
(let* ((t0 (or time (current-time)))
|
|
|
|
(t0-zone (current-time-zone t0))
|
|
|
|
(t0-utc-diff (car t0-zone))
|
2008-03-14 03:38:38 +00:00
|
|
|
(t0-name (cadr t0-zone)))
|
2006-11-10 08:54:38 +00:00
|
|
|
(if (not t0-utc-diff)
|
|
|
|
;; Little or no time zone information is available.
|
|
|
|
(list nil nil t0-name t0-name nil nil nil nil)
|
|
|
|
(let* ((t1 (calendar-next-time-zone-transition t0))
|
|
|
|
(t2 (and t1 (calendar-next-time-zone-transition t1))))
|
|
|
|
(if (not t2)
|
2007-03-17 17:49:59 +00:00
|
|
|
;; This locale does not have daylight saving time.
|
2006-11-10 08:54:38 +00:00
|
|
|
(list (/ t0-utc-diff 60) 0 t0-name t0-name nil nil 0 0)
|
2007-03-17 17:49:59 +00:00
|
|
|
;; Use heuristics to find daylight saving parameters.
|
2006-11-10 08:54:38 +00:00
|
|
|
(let* ((t1-zone (current-time-zone t1))
|
|
|
|
(t1-utc-diff (car t1-zone))
|
2008-03-14 03:38:38 +00:00
|
|
|
(t1-name (cadr t1-zone))
|
2006-11-10 08:54:38 +00:00
|
|
|
(t1-date-sec (calendar-absolute-from-time t1 t0-utc-diff))
|
|
|
|
(t2-date-sec (calendar-absolute-from-time t2 t1-utc-diff))
|
|
|
|
;; TODO When calendar-dst-check-each-year-flag is non-nil,
|
|
|
|
;; the rules can be simpler than they currently are.
|
|
|
|
(t1-rules (calendar-time-zone-daylight-rules
|
|
|
|
(car t1-date-sec) t0-utc-diff))
|
|
|
|
(t2-rules (calendar-time-zone-daylight-rules
|
|
|
|
(car t2-date-sec) t1-utc-diff))
|
|
|
|
(t1-time (/ (cdr t1-date-sec) 60))
|
|
|
|
(t2-time (/ (cdr t2-date-sec) 60)))
|
2017-12-08 20:11:25 +00:00
|
|
|
(if (nth 7 (decode-time t1))
|
|
|
|
(list (/ t0-utc-diff 60) (/ (- t1-utc-diff t0-utc-diff) 60)
|
|
|
|
t0-name t1-name t1-rules t2-rules t1-time t2-time)
|
|
|
|
(list (/ t1-utc-diff 60) (/ (- t0-utc-diff t1-utc-diff) 60)
|
|
|
|
t1-name t0-name t2-rules t1-rules t2-time t1-time))))))))
|
2006-11-10 08:54:38 +00:00
|
|
|
|
|
|
|
(defvar calendar-dst-transition-cache nil
|
2007-03-17 17:49:59 +00:00
|
|
|
"Internal cal-dst variable storing date of daylight saving time transitions.
|
2006-11-10 08:54:38 +00:00
|
|
|
Value is a list with elements of the form (YEAR START END), where
|
|
|
|
START and END are expressions that when evaluated return the
|
2008-03-08 20:41:30 +00:00
|
|
|
start and end dates (respectively) for DST in YEAR. Used by the
|
2006-11-10 08:54:38 +00:00
|
|
|
function `calendar-dst-find-startend'.")
|
|
|
|
|
|
|
|
(defun calendar-dst-find-startend (year)
|
2007-03-17 17:49:59 +00:00
|
|
|
"Find the dates in YEAR on which daylight saving time starts and ends.
|
2006-11-10 08:54:38 +00:00
|
|
|
Returns a list (YEAR START END), where START and END are
|
|
|
|
expressions that when evaluated return the start and end dates,
|
|
|
|
respectively. This function first attempts to use pre-calculated
|
|
|
|
data from `calendar-dst-transition-cache', otherwise it calls
|
2007-04-17 02:29:50 +00:00
|
|
|
`calendar-dst-find-data' (and adds the results to the cache).
|
2019-02-11 07:47:43 +00:00
|
|
|
If dates in YEAR cannot be handled by `encode-time' (e.g.,
|
|
|
|
if they are out of range for POSIX time_t), then rather
|
2007-04-17 02:29:50 +00:00
|
|
|
than an error this function returns the result appropriate for
|
|
|
|
the current year."
|
2006-11-10 08:54:38 +00:00
|
|
|
(let ((e (assoc year calendar-dst-transition-cache))
|
|
|
|
f)
|
|
|
|
(or e
|
|
|
|
(progn
|
2007-04-17 02:29:50 +00:00
|
|
|
(setq e (calendar-dst-find-data
|
|
|
|
(condition-case nil
|
|
|
|
(encode-time 1 0 0 1 1 year)
|
|
|
|
(error
|
|
|
|
(encode-time 1 0 0 1 1 (nth 5 (decode-time))))))
|
2006-11-10 08:54:38 +00:00
|
|
|
f (nth 4 e)
|
|
|
|
e (list year f (nth 5 e))
|
|
|
|
calendar-dst-transition-cache
|
|
|
|
(append calendar-dst-transition-cache (list e)))
|
|
|
|
e))))
|
|
|
|
|
* cal-dst.el: New file.
(calendar-/, calendar-%, calendar-absolute-from-time,
calendar-time-from-absolute, calendar-next-time-zone-transition,
calendar-time-zone-daylight-rules): New functions.
(calendar-current-time-zone): Moved from calendar.el and rewritten.
(calendar-current-time-zone-cache): New variable.
(calendar-current-time-zone, calendar-time-zone,
calendar-daylight-time-offset, calendar-standard-time-zone-name,
calendar-daylight-time-zone-name,
calendar-daylight-savings-starts, calendar-daylight-savings-ends,
calendar-daylight-savings-switchover-time): Moved from calendar.el.
1993-06-22 03:25:13 +00:00
|
|
|
(defun calendar-current-time-zone ()
|
|
|
|
"Return UTC difference, dst offset, names and rules for current time zone.
|
|
|
|
|
(calendar-time-zone-daylight-rules): Scan through the
next few years until at most one rule remains; if none remain, then
just use the first candidate rule; it's wrong in general, but it's
right for at least one year. This is a better heuristic in case the
underlying time zone implementation has bugs (which is all too
common). If possible, don't convert back and forth between gregorian
and absolute; this speeds things up noticeably. This uses the new
calendar-nth-named-absday function.
(calendar-current-time-zone): Some locales start DST at a different
time of day than they end; allow for this by yielding both times. The
performance speedups in calendar.el are great enough that we now no
longer need the "Checking time zone data..." message. If
current-time-zone yields nil, don't bother with
calendar-next-time-zone-transition. Use clearer names for local vars.
(calendar-time-zone, calendar-daylight-time-offset,
calendar-{standard,daylight}-time-zone-name,
calendar-daylight-savings-{starts,ends}): Default to US Eastern rules
for information that is not available.
(calendar-daylight-savings-{starts,ends}-time): New vars, replacing
calendar-daylight-savings-switchover-time, to support locales that
start DST at a different time of day than they end.
(calendar-absolute-from-time):
Fix typo by interchanging floor and mod.
1993-08-28 04:14:25 +00:00
|
|
|
Returns (UTC-DIFF DST-OFFSET STD-ZONE DST-ZONE DST-STARTS DST-ENDS
|
|
|
|
DST-STARTS-TIME DST-ENDS-TIME), based on a heuristic probing of what the
|
|
|
|
system knows:
|
* cal-dst.el: New file.
(calendar-/, calendar-%, calendar-absolute-from-time,
calendar-time-from-absolute, calendar-next-time-zone-transition,
calendar-time-zone-daylight-rules): New functions.
(calendar-current-time-zone): Moved from calendar.el and rewritten.
(calendar-current-time-zone-cache): New variable.
(calendar-current-time-zone, calendar-time-zone,
calendar-daylight-time-offset, calendar-standard-time-zone-name,
calendar-daylight-time-zone-name,
calendar-daylight-savings-starts, calendar-daylight-savings-ends,
calendar-daylight-savings-switchover-time): Moved from calendar.el.
1993-06-22 03:25:13 +00:00
|
|
|
|
|
|
|
UTC-DIFF is an integer specifying the number of minutes difference between
|
|
|
|
standard time in the current time zone and Coordinated Universal Time
|
|
|
|
(Greenwich Mean Time). A negative value means west of Greenwich.
|
2007-03-17 17:49:59 +00:00
|
|
|
DST-OFFSET is an integer giving the daylight saving time offset in minutes.
|
* cal-dst.el: New file.
(calendar-/, calendar-%, calendar-absolute-from-time,
calendar-time-from-absolute, calendar-next-time-zone-transition,
calendar-time-zone-daylight-rules): New functions.
(calendar-current-time-zone): Moved from calendar.el and rewritten.
(calendar-current-time-zone-cache): New variable.
(calendar-current-time-zone, calendar-time-zone,
calendar-daylight-time-offset, calendar-standard-time-zone-name,
calendar-daylight-time-zone-name,
calendar-daylight-savings-starts, calendar-daylight-savings-ends,
calendar-daylight-savings-switchover-time): Moved from calendar.el.
1993-06-22 03:25:13 +00:00
|
|
|
STD-ZONE is a string giving the name of the time zone when no seasonal time
|
|
|
|
adjustment is in effect.
|
|
|
|
DST-ZONE is a string giving the name of the time zone when there is a seasonal
|
|
|
|
time adjustment in effect.
|
|
|
|
DST-STARTS and DST-ENDS are sexps in the variable `year' giving the daylight
|
2007-03-17 17:49:59 +00:00
|
|
|
saving time start and end rules, in the form expected by
|
* cal-dst.el: New file.
(calendar-/, calendar-%, calendar-absolute-from-time,
calendar-time-from-absolute, calendar-next-time-zone-transition,
calendar-time-zone-daylight-rules): New functions.
(calendar-current-time-zone): Moved from calendar.el and rewritten.
(calendar-current-time-zone-cache): New variable.
(calendar-current-time-zone, calendar-time-zone,
calendar-daylight-time-offset, calendar-standard-time-zone-name,
calendar-daylight-time-zone-name,
calendar-daylight-savings-starts, calendar-daylight-savings-ends,
calendar-daylight-savings-switchover-time): Moved from calendar.el.
1993-06-22 03:25:13 +00:00
|
|
|
`calendar-daylight-savings-starts'.
|
(calendar-time-zone-daylight-rules): Scan through the
next few years until at most one rule remains; if none remain, then
just use the first candidate rule; it's wrong in general, but it's
right for at least one year. This is a better heuristic in case the
underlying time zone implementation has bugs (which is all too
common). If possible, don't convert back and forth between gregorian
and absolute; this speeds things up noticeably. This uses the new
calendar-nth-named-absday function.
(calendar-current-time-zone): Some locales start DST at a different
time of day than they end; allow for this by yielding both times. The
performance speedups in calendar.el are great enough that we now no
longer need the "Checking time zone data..." message. If
current-time-zone yields nil, don't bother with
calendar-next-time-zone-transition. Use clearer names for local vars.
(calendar-time-zone, calendar-daylight-time-offset,
calendar-{standard,daylight}-time-zone-name,
calendar-daylight-savings-{starts,ends}): Default to US Eastern rules
for information that is not available.
(calendar-daylight-savings-{starts,ends}-time): New vars, replacing
calendar-daylight-savings-switchover-time, to support locales that
start DST at a different time of day than they end.
(calendar-absolute-from-time):
Fix typo by interchanging floor and mod.
1993-08-28 04:14:25 +00:00
|
|
|
DST-STARTS-TIME and DST-ENDS-TIME are integers giving the number of minutes
|
2007-03-17 17:49:59 +00:00
|
|
|
after midnight that daylight saving time starts and ends.
|
* cal-dst.el: New file.
(calendar-/, calendar-%, calendar-absolute-from-time,
calendar-time-from-absolute, calendar-next-time-zone-transition,
calendar-time-zone-daylight-rules): New functions.
(calendar-current-time-zone): Moved from calendar.el and rewritten.
(calendar-current-time-zone-cache): New variable.
(calendar-current-time-zone, calendar-time-zone,
calendar-daylight-time-offset, calendar-standard-time-zone-name,
calendar-daylight-time-zone-name,
calendar-daylight-savings-starts, calendar-daylight-savings-ends,
calendar-daylight-savings-switchover-time): Moved from calendar.el.
1993-06-22 03:25:13 +00:00
|
|
|
|
(calendar-time-zone-daylight-rules): Scan through the
next few years until at most one rule remains; if none remain, then
just use the first candidate rule; it's wrong in general, but it's
right for at least one year. This is a better heuristic in case the
underlying time zone implementation has bugs (which is all too
common). If possible, don't convert back and forth between gregorian
and absolute; this speeds things up noticeably. This uses the new
calendar-nth-named-absday function.
(calendar-current-time-zone): Some locales start DST at a different
time of day than they end; allow for this by yielding both times. The
performance speedups in calendar.el are great enough that we now no
longer need the "Checking time zone data..." message. If
current-time-zone yields nil, don't bother with
calendar-next-time-zone-transition. Use clearer names for local vars.
(calendar-time-zone, calendar-daylight-time-offset,
calendar-{standard,daylight}-time-zone-name,
calendar-daylight-savings-{starts,ends}): Default to US Eastern rules
for information that is not available.
(calendar-daylight-savings-{starts,ends}-time): New vars, replacing
calendar-daylight-savings-switchover-time, to support locales that
start DST at a different time of day than they end.
(calendar-absolute-from-time):
Fix typo by interchanging floor and mod.
1993-08-28 04:14:25 +00:00
|
|
|
If the local area does not use a seasonal time adjustment, STD-ZONE and
|
|
|
|
DST-ZONE are equal, and all the DST-* integer variables are 0.
|
* cal-dst.el: New file.
(calendar-/, calendar-%, calendar-absolute-from-time,
calendar-time-from-absolute, calendar-next-time-zone-transition,
calendar-time-zone-daylight-rules): New functions.
(calendar-current-time-zone): Moved from calendar.el and rewritten.
(calendar-current-time-zone-cache): New variable.
(calendar-current-time-zone, calendar-time-zone,
calendar-daylight-time-offset, calendar-standard-time-zone-name,
calendar-daylight-time-zone-name,
calendar-daylight-savings-starts, calendar-daylight-savings-ends,
calendar-daylight-savings-switchover-time): Moved from calendar.el.
1993-06-22 03:25:13 +00:00
|
|
|
|
|
|
|
Some operating systems cannot provide all this information to Emacs; in this
|
|
|
|
case, `calendar-current-time-zone' returns a list containing nil for the data
|
|
|
|
it can't find."
|
2012-06-28 12:13:38 +00:00
|
|
|
(or calendar-current-time-zone-cache
|
|
|
|
(setq calendar-current-time-zone-cache (calendar-dst-find-data))))
|
* cal-dst.el: New file.
(calendar-/, calendar-%, calendar-absolute-from-time,
calendar-time-from-absolute, calendar-next-time-zone-transition,
calendar-time-zone-daylight-rules): New functions.
(calendar-current-time-zone): Moved from calendar.el and rewritten.
(calendar-current-time-zone-cache): New variable.
(calendar-current-time-zone, calendar-time-zone,
calendar-daylight-time-offset, calendar-standard-time-zone-name,
calendar-daylight-time-zone-name,
calendar-daylight-savings-starts, calendar-daylight-savings-ends,
calendar-daylight-savings-switchover-time): Moved from calendar.el.
1993-06-22 03:25:13 +00:00
|
|
|
|
2008-03-07 05:13:00 +00:00
|
|
|
|
|
|
|
;; Following options should be set based on conditions when the code
|
|
|
|
;; is invoked, so are not suitable for dumping into loaddefs.el. They
|
|
|
|
;; default to US Eastern time if time zone info is not available.
|
* cal-dst.el: New file.
(calendar-/, calendar-%, calendar-absolute-from-time,
calendar-time-from-absolute, calendar-next-time-zone-transition,
calendar-time-zone-daylight-rules): New functions.
(calendar-current-time-zone): Moved from calendar.el and rewritten.
(calendar-current-time-zone-cache): New variable.
(calendar-current-time-zone, calendar-time-zone,
calendar-daylight-time-offset, calendar-standard-time-zone-name,
calendar-daylight-time-zone-name,
calendar-daylight-savings-starts, calendar-daylight-savings-ends,
calendar-daylight-savings-switchover-time): Moved from calendar.el.
1993-06-22 03:25:13 +00:00
|
|
|
|
|
|
|
(calendar-current-time-zone)
|
|
|
|
|
2008-03-07 05:13:00 +00:00
|
|
|
(defcustom calendar-time-zone (or (car calendar-current-time-zone-cache) -300)
|
2008-03-08 20:41:30 +00:00
|
|
|
"Number of minutes difference between local standard time and UTC.
|
2008-03-07 05:13:00 +00:00
|
|
|
For example, -300 for New York City, -480 for Los Angeles."
|
|
|
|
:type 'integer
|
|
|
|
:group 'calendar-dst)
|
* cal-dst.el: New file.
(calendar-/, calendar-%, calendar-absolute-from-time,
calendar-time-from-absolute, calendar-next-time-zone-transition,
calendar-time-zone-daylight-rules): New functions.
(calendar-current-time-zone): Moved from calendar.el and rewritten.
(calendar-current-time-zone-cache): New variable.
(calendar-current-time-zone, calendar-time-zone,
calendar-daylight-time-offset, calendar-standard-time-zone-name,
calendar-daylight-time-zone-name,
calendar-daylight-savings-starts, calendar-daylight-savings-ends,
calendar-daylight-savings-switchover-time): Moved from calendar.el.
1993-06-22 03:25:13 +00:00
|
|
|
|
2008-03-07 05:13:00 +00:00
|
|
|
(defcustom calendar-daylight-time-offset
|
2008-03-14 03:38:38 +00:00
|
|
|
(or (cadr calendar-current-time-zone-cache) 60)
|
2008-03-07 05:13:00 +00:00
|
|
|
"Number of minutes difference between daylight saving and standard time.
|
|
|
|
If the locale never uses daylight saving time, set this to 0."
|
|
|
|
:type 'integer
|
|
|
|
:group 'calendar-dst)
|
* cal-dst.el: New file.
(calendar-/, calendar-%, calendar-absolute-from-time,
calendar-time-from-absolute, calendar-next-time-zone-transition,
calendar-time-zone-daylight-rules): New functions.
(calendar-current-time-zone): Moved from calendar.el and rewritten.
(calendar-current-time-zone-cache): New variable.
(calendar-current-time-zone, calendar-time-zone,
calendar-daylight-time-offset, calendar-standard-time-zone-name,
calendar-daylight-time-zone-name,
calendar-daylight-savings-starts, calendar-daylight-savings-ends,
calendar-daylight-savings-switchover-time): Moved from calendar.el.
1993-06-22 03:25:13 +00:00
|
|
|
|
2008-03-07 05:13:00 +00:00
|
|
|
(defcustom calendar-standard-time-zone-name
|
2008-03-14 03:38:38 +00:00
|
|
|
(or (nth 2 calendar-current-time-zone-cache) "EST")
|
2008-03-07 05:13:00 +00:00
|
|
|
"Abbreviated name of standard time zone at `calendar-location-name'.
|
|
|
|
For example, \"EST\" in New York City, \"PST\" for Los Angeles."
|
|
|
|
:type 'string
|
|
|
|
:group 'calendar-dst)
|
* cal-dst.el: New file.
(calendar-/, calendar-%, calendar-absolute-from-time,
calendar-time-from-absolute, calendar-next-time-zone-transition,
calendar-time-zone-daylight-rules): New functions.
(calendar-current-time-zone): Moved from calendar.el and rewritten.
(calendar-current-time-zone-cache): New variable.
(calendar-current-time-zone, calendar-time-zone,
calendar-daylight-time-offset, calendar-standard-time-zone-name,
calendar-daylight-time-zone-name,
calendar-daylight-savings-starts, calendar-daylight-savings-ends,
calendar-daylight-savings-switchover-time): Moved from calendar.el.
1993-06-22 03:25:13 +00:00
|
|
|
|
2008-03-07 05:13:00 +00:00
|
|
|
(defcustom calendar-daylight-time-zone-name
|
2008-03-14 03:38:38 +00:00
|
|
|
(or (nth 3 calendar-current-time-zone-cache) "EDT")
|
2008-03-07 05:13:00 +00:00
|
|
|
"Abbreviated name of daylight saving time zone at `calendar-location-name'.
|
|
|
|
For example, \"EDT\" in New York City, \"PDT\" for Los Angeles."
|
|
|
|
:type 'string
|
|
|
|
:group 'calendar-dst)
|
|
|
|
|
|
|
|
(defcustom calendar-daylight-savings-starts-time
|
2008-03-14 03:38:38 +00:00
|
|
|
(or (nth 6 calendar-current-time-zone-cache) 120)
|
2008-03-07 05:13:00 +00:00
|
|
|
"Number of minutes after midnight that daylight saving time starts."
|
|
|
|
:type 'integer
|
|
|
|
:group 'calendar-dst)
|
|
|
|
|
|
|
|
(defcustom calendar-daylight-savings-ends-time
|
2008-03-14 03:38:38 +00:00
|
|
|
(or (nth 7 calendar-current-time-zone-cache)
|
2008-03-07 05:13:00 +00:00
|
|
|
calendar-daylight-savings-starts-time)
|
|
|
|
"Number of minutes after midnight that daylight saving time ends."
|
|
|
|
:type 'integer
|
|
|
|
:group 'calendar-dst)
|
2003-02-04 13:24:35 +00:00
|
|
|
|
2006-11-10 08:54:38 +00:00
|
|
|
|
|
|
|
(defun calendar-dst-starts (year)
|
2007-03-17 17:49:59 +00:00
|
|
|
"Return the date of YEAR on which daylight saving time starts.
|
2006-11-10 08:54:38 +00:00
|
|
|
This function respects the value of `calendar-dst-check-each-year-flag'."
|
|
|
|
(or (let ((expr (if calendar-dst-check-each-year-flag
|
|
|
|
(cadr (calendar-dst-find-startend year))
|
|
|
|
(nth 4 calendar-current-time-zone-cache))))
|
2017-12-04 20:50:14 +00:00
|
|
|
(calendar-dlet* ((year year))
|
|
|
|
(if expr (eval expr))))
|
2017-09-13 22:52:52 +00:00
|
|
|
;; New US rules commencing 2007. https://www.iana.org/time-zones
|
2006-11-10 08:54:38 +00:00
|
|
|
(and (not (zerop calendar-daylight-time-offset))
|
2006-12-24 02:58:41 +00:00
|
|
|
(calendar-nth-named-day 2 0 3 year))))
|
2006-11-10 08:54:38 +00:00
|
|
|
|
|
|
|
(defun calendar-dst-ends (year)
|
2007-03-17 17:49:59 +00:00
|
|
|
"Return the date of YEAR on which daylight saving time ends.
|
2006-11-10 08:54:38 +00:00
|
|
|
This function respects the value of `calendar-dst-check-each-year-flag'."
|
|
|
|
(or (let ((expr (if calendar-dst-check-each-year-flag
|
|
|
|
(nth 2 (calendar-dst-find-startend year))
|
|
|
|
(nth 5 calendar-current-time-zone-cache))))
|
2017-12-04 20:50:14 +00:00
|
|
|
(calendar-dlet* ((year year))
|
|
|
|
(if expr (eval expr))))
|
2017-09-13 22:52:52 +00:00
|
|
|
;; New US rules commencing 2007. https://www.iana.org/time-zones
|
2006-11-10 08:54:38 +00:00
|
|
|
(and (not (zerop calendar-daylight-time-offset))
|
2006-12-24 02:58:41 +00:00
|
|
|
(calendar-nth-named-day 1 0 11 year))))
|
2006-11-10 08:54:38 +00:00
|
|
|
|
2008-04-11 03:43:55 +00:00
|
|
|
;; used by calc, solar.
|
1995-09-21 02:54:58 +00:00
|
|
|
(defun dst-in-effect (date)
|
2007-03-17 17:49:59 +00:00
|
|
|
"True if on absolute DATE daylight saving time is in effect.
|
1995-12-05 22:55:22 +00:00
|
|
|
Fractional part of DATE is local standard time of day."
|
2017-12-04 20:50:14 +00:00
|
|
|
(calendar-dlet* ((year (calendar-extract-year
|
|
|
|
(calendar-gregorian-from-absolute (floor date)))))
|
|
|
|
(let* ((dst-starts-gregorian (eval calendar-daylight-savings-starts))
|
|
|
|
(dst-ends-gregorian (eval calendar-daylight-savings-ends))
|
|
|
|
(dst-starts (and dst-starts-gregorian
|
|
|
|
(+ (calendar-absolute-from-gregorian
|
|
|
|
dst-starts-gregorian)
|
|
|
|
(/ calendar-daylight-savings-starts-time
|
|
|
|
60.0 24.0))))
|
|
|
|
(dst-ends (and dst-ends-gregorian
|
1995-09-21 02:54:58 +00:00
|
|
|
(+ (calendar-absolute-from-gregorian
|
2017-12-04 20:50:14 +00:00
|
|
|
dst-ends-gregorian)
|
|
|
|
(/ (- calendar-daylight-savings-ends-time
|
|
|
|
calendar-daylight-time-offset)
|
|
|
|
60.0 24.0)))))
|
|
|
|
(and dst-starts dst-ends
|
|
|
|
(if (< dst-starts dst-ends)
|
|
|
|
(and (<= dst-starts date) (< date dst-ends))
|
|
|
|
(or (<= dst-starts date) (< date dst-ends)))))))
|
1995-09-21 02:54:58 +00:00
|
|
|
|
2008-04-11 03:43:55 +00:00
|
|
|
;; used by calc, lunar, solar.
|
2011-04-19 04:11:01 +00:00
|
|
|
(defun dst-adjust-time (date time)
|
1995-09-21 02:54:58 +00:00
|
|
|
"Adjust, to account for dst on DATE, decimal fraction standard TIME.
|
|
|
|
Returns a list (date adj-time zone) where `date' and `adj-time' are the values
|
|
|
|
adjusted for `zone'; here `date' is a list (month day year), `adj-time' is a
|
|
|
|
decimal fraction time, and `zone' is a string.
|
|
|
|
|
2007-03-17 17:49:59 +00:00
|
|
|
Conversion to daylight saving time is done according to
|
1995-09-21 02:54:58 +00:00
|
|
|
`calendar-daylight-savings-starts', `calendar-daylight-savings-ends',
|
|
|
|
`calendar-daylight-savings-starts-time',
|
2008-03-26 03:10:23 +00:00
|
|
|
`calendar-daylight-savings-ends-time', and `calendar-daylight-time-offset'."
|
1995-09-21 02:54:58 +00:00
|
|
|
(let* ((rounded-abs-date (+ (calendar-absolute-from-gregorian date)
|
2008-03-13 06:29:28 +00:00
|
|
|
(/ (round (* 60 time)) 60.0 24.0)))
|
1995-09-21 02:54:58 +00:00
|
|
|
(dst (dst-in-effect rounded-abs-date))
|
2008-03-13 06:29:28 +00:00
|
|
|
(time-zone (if dst
|
|
|
|
calendar-daylight-time-zone-name
|
|
|
|
calendar-standard-time-zone-name))
|
|
|
|
(time (+ rounded-abs-date
|
1995-09-21 02:54:58 +00:00
|
|
|
(if dst (/ calendar-daylight-time-offset 24.0 60.0) 0))))
|
|
|
|
(list (calendar-gregorian-from-absolute (truncate time))
|
|
|
|
(* 24.0 (- time (truncate time)))
|
|
|
|
time-zone)))
|
|
|
|
|
* cal-dst.el: New file.
(calendar-/, calendar-%, calendar-absolute-from-time,
calendar-time-from-absolute, calendar-next-time-zone-transition,
calendar-time-zone-daylight-rules): New functions.
(calendar-current-time-zone): Moved from calendar.el and rewritten.
(calendar-current-time-zone-cache): New variable.
(calendar-current-time-zone, calendar-time-zone,
calendar-daylight-time-offset, calendar-standard-time-zone-name,
calendar-daylight-time-zone-name,
calendar-daylight-savings-starts, calendar-daylight-savings-ends,
calendar-daylight-savings-switchover-time): Moved from calendar.el.
1993-06-22 03:25:13 +00:00
|
|
|
(provide 'cal-dst)
|
|
|
|
|
|
|
|
;;; cal-dst.el ends here
|