diff options
| author | Glenn Morris | 2008-03-08 20:41:30 +0000 |
|---|---|---|
| committer | Glenn Morris | 2008-03-08 20:41:30 +0000 |
| commit | 311cc55195cd1fe67f75285ddb03ac81072631ff (patch) | |
| tree | 2e4ed7c667ff724b486b278402730e4093578b4c | |
| parent | f3924c53a5dbb49b97990d305e8fe59482c694f4 (diff) | |
| download | emacs-311cc55195cd1fe67f75285ddb03ac81072631ff.tar.gz emacs-311cc55195cd1fe67f75285ddb03ac81072631ff.zip | |
(calendar-next-time-zone-transition, calendar-time-zone): Doc fixes.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/calendar/cal-dst.el | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 3e0ed6ba640..17c9c7de00d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -30,14 +30,16 @@ | |||
| 30 | (french-calendar-day-name-array, french-calendar-special-days-array): | 30 | (french-calendar-day-name-array, french-calendar-special-days-array): |
| 31 | Add doc strings. | 31 | Add doc strings. |
| 32 | 32 | ||
| 33 | * calendar/cal-dst.el (calendar-next-time-zone-transition) | ||
| 34 | (calendar-time-zone): | ||
| 33 | * calendar/cal-iso.el (calendar-iso-read-args): | 35 | * calendar/cal-iso.el (calendar-iso-read-args): |
| 34 | * calendar/lunar.el (phases-of-moon, lunar-new-moon-on-or-after): | ||
| 35 | * calendar/cal-mayan.el (calendar-string-to-mayan-long-count) | 36 | * calendar/cal-mayan.el (calendar-string-to-mayan-long-count) |
| 36 | (calendar-mayan-haab-to-string, calendar-mayan-tzolkin-to-string) | 37 | (calendar-mayan-haab-to-string, calendar-mayan-tzolkin-to-string) |
| 37 | (calendar-read-mayan-haab-date, calendar-read-mayan-tzolkin-date) | 38 | (calendar-read-mayan-haab-date, calendar-read-mayan-tzolkin-date) |
| 38 | (calendar-next-calendar-round-date) | 39 | (calendar-next-calendar-round-date) |
| 39 | (calendar-mayan-long-count-common-era): | 40 | (calendar-mayan-long-count-common-era): |
| 40 | * calendar/cal-move.el (calendar-scroll-left, calendar-scroll-right): | 41 | * calendar/cal-move.el (calendar-scroll-left, calendar-scroll-right): |
| 42 | * calendar/lunar.el (phases-of-moon, lunar-new-moon-on-or-after): | ||
| 41 | Doc fixes. | 43 | Doc fixes. |
| 42 | 44 | ||
| 43 | * calendar/cal-persia.el (persian-calendar-month-name-array) | 45 | * calendar/cal-persia.el (persian-calendar-month-name-array) |
diff --git a/lisp/calendar/cal-dst.el b/lisp/calendar/cal-dst.el index a8df56ee27a..b35ec29deb0 100644 --- a/lisp/calendar/cal-dst.el +++ b/lisp/calendar/cal-dst.el | |||
| @@ -141,7 +141,7 @@ midnight UTC on absolute date ABS-DATE." | |||
| 141 | 141 | ||
| 142 | (defun calendar-next-time-zone-transition (time) | 142 | (defun calendar-next-time-zone-transition (time) |
| 143 | "Return the time of the next time zone transition after TIME. | 143 | "Return the time of the next time zone transition after TIME. |
| 144 | Both TIME and the result are acceptable arguments to current-time-zone. | 144 | Both TIME and the result are acceptable arguments to `current-time-zone'. |
| 145 | Return nil if no such transition can be found." | 145 | Return nil if no such transition can be found." |
| 146 | (let* ((base 65536);; 2^16 = base of current-time output | 146 | (let* ((base 65536);; 2^16 = base of current-time output |
| 147 | (quarter-multiple 120);; approx = (seconds per quarter year) / base | 147 | (quarter-multiple 120);; approx = (seconds per quarter year) / base |
| @@ -300,7 +300,7 @@ for `calendar-current-time-zone'." | |||
| 300 | "Internal cal-dst variable storing date of daylight saving time transitions. | 300 | "Internal cal-dst variable storing date of daylight saving time transitions. |
| 301 | Value is a list with elements of the form (YEAR START END), where | 301 | Value is a list with elements of the form (YEAR START END), where |
| 302 | START and END are expressions that when evaluated return the | 302 | START and END are expressions that when evaluated return the |
| 303 | start and end dates (respectively) for DST in YEAR. Used by the | 303 | start and end dates (respectively) for DST in YEAR. Used by the |
| 304 | function `calendar-dst-find-startend'.") | 304 | function `calendar-dst-find-startend'.") |
| 305 | 305 | ||
| 306 | (defun calendar-dst-find-startend (year) | 306 | (defun calendar-dst-find-startend (year) |
| @@ -367,8 +367,7 @@ it can't find." | |||
| 367 | (calendar-current-time-zone) | 367 | (calendar-current-time-zone) |
| 368 | 368 | ||
| 369 | (defcustom calendar-time-zone (or (car calendar-current-time-zone-cache) -300) | 369 | (defcustom calendar-time-zone (or (car calendar-current-time-zone-cache) -300) |
| 370 | "Number of minutes difference between local standard time at | 370 | "Number of minutes difference between local standard time and UTC. |
| 371 | `calendar-location-name' and Coordinated Universal (Greenwich) Time. | ||
| 372 | For example, -300 for New York City, -480 for Los Angeles." | 371 | For example, -300 for New York City, -480 for Los Angeles." |
| 373 | :type 'integer | 372 | :type 'integer |
| 374 | :group 'calendar-dst) | 373 | :group 'calendar-dst) |