Mercurial > emacs
diff src/editfns.c @ 90789:c0409ee15cee
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 670-674)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 209-210)
- Merge from emacs--devo--0
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-185
author | Miles Bader <miles@gnu.org> |
---|---|
date | Wed, 21 Mar 2007 13:33:07 +0000 |
parents | dd7c098af727 0c2cf4467655 |
children | 4ef881a120fe |
line wrap: on
line diff
--- a/src/editfns.c Sun Mar 18 14:12:38 2007 +0000 +++ b/src/editfns.c Wed Mar 21 13:33:07 2007 +0000 @@ -1727,7 +1727,7 @@ between 0 and 23. DAY is an integer between 1 and 31. MONTH is an integer between 1 and 12. YEAR is an integer indicating the four-digit year. DOW is the day of week, an integer between 0 and 6, -where 0 is Sunday. DST is t if daylight savings time is effect, +where 0 is Sunday. DST is t if daylight saving time is in effect, otherwise nil. ZONE is an integer indicating the number of seconds east of Greenwich. (Note that Common Lisp has different meanings for DOW and ZONE.) */) @@ -1776,7 +1776,7 @@ ZONE defaults to the current time zone rule. This can be a string or t (as from `set-time-zone-rule'), or it can be a list \(as from `current-time-zone') or an integer (as from `decode-time') -applied without consideration for daylight savings time. +applied without consideration for daylight saving time. You can pass more than 7 arguments; then the first six arguments are used as SECOND through YEAR, and the *last* argument is used as ZONE.