aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChong Yidong2007-03-17 18:31:34 +0000
committerChong Yidong2007-03-17 18:31:34 +0000
commit9c279ddfbaef5e25119f08cb555a036cf0c22c7e (patch)
tree44fe2d7050536b4af0799b57d6355d412064b151 /src
parent8b60f44cc40ae2d556e9c34316f25e5c27bf114c (diff)
downloademacs-9c279ddfbaef5e25119f08cb555a036cf0c22c7e.tar.gz
emacs-9c279ddfbaef5e25119f08cb555a036cf0c22c7e.zip
(Fdecode_time, Fencode_time): "daylight savings" -> "daylight saving"
doc fix.
Diffstat (limited to 'src')
-rw-r--r--src/editfns.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/editfns.c b/src/editfns.c
index 5053119d0c4..8a0361f13b5 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -1729,7 +1729,7 @@ support. MINUTE is an integer between 0 and 59. HOUR is an integer
1729between 0 and 23. DAY is an integer between 1 and 31. MONTH is an 1729between 0 and 23. DAY is an integer between 1 and 31. MONTH is an
1730integer between 1 and 12. YEAR is an integer indicating the 1730integer between 1 and 12. YEAR is an integer indicating the
1731four-digit year. DOW is the day of week, an integer between 0 and 6, 1731four-digit year. DOW is the day of week, an integer between 0 and 6,
1732where 0 is Sunday. DST is t if daylight savings time is effect, 1732where 0 is Sunday. DST is t if daylight saving time is effect,
1733otherwise nil. ZONE is an integer indicating the number of seconds 1733otherwise nil. ZONE is an integer indicating the number of seconds
1734east of Greenwich. (Note that Common Lisp has different meanings for 1734east of Greenwich. (Note that Common Lisp has different meanings for
1735DOW and ZONE.) */) 1735DOW and ZONE.) */)
@@ -1778,7 +1778,7 @@ This is the reverse operation of `decode-time', which see.
1778ZONE defaults to the current time zone rule. This can 1778ZONE defaults to the current time zone rule. This can
1779be a string or t (as from `set-time-zone-rule'), or it can be a list 1779be a string or t (as from `set-time-zone-rule'), or it can be a list
1780\(as from `current-time-zone') or an integer (as from `decode-time') 1780\(as from `current-time-zone') or an integer (as from `decode-time')
1781applied without consideration for daylight savings time. 1781applied without consideration for daylight saving time.
1782 1782
1783You can pass more than 7 arguments; then the first six arguments 1783You can pass more than 7 arguments; then the first six arguments
1784are used as SECOND through YEAR, and the *last* argument is used as ZONE. 1784are used as SECOND through YEAR, and the *last* argument is used as ZONE.