comparison 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
comparison
equal deleted inserted replaced
90788:a12805fdabe8 90789:c0409ee15cee
1725 and 60; SEC is 60 for a leap second, which only some operating systems 1725 and 60; SEC is 60 for a leap second, which only some operating systems
1726 support. MINUTE is an integer between 0 and 59. HOUR is an integer 1726 support. MINUTE is an integer between 0 and 59. HOUR is an integer
1727 between 0 and 23. DAY is an integer between 1 and 31. MONTH is an 1727 between 0 and 23. DAY is an integer between 1 and 31. MONTH is an
1728 integer between 1 and 12. YEAR is an integer indicating the 1728 integer between 1 and 12. YEAR is an integer indicating the
1729 four-digit year. DOW is the day of week, an integer between 0 and 6, 1729 four-digit year. DOW is the day of week, an integer between 0 and 6,
1730 where 0 is Sunday. DST is t if daylight savings time is effect, 1730 where 0 is Sunday. DST is t if daylight saving time is in effect,
1731 otherwise nil. ZONE is an integer indicating the number of seconds 1731 otherwise nil. ZONE is an integer indicating the number of seconds
1732 east of Greenwich. (Note that Common Lisp has different meanings for 1732 east of Greenwich. (Note that Common Lisp has different meanings for
1733 DOW and ZONE.) */) 1733 DOW and ZONE.) */)
1734 (specified_time) 1734 (specified_time)
1735 Lisp_Object specified_time; 1735 Lisp_Object specified_time;
1774 doc: /* Convert SECOND, MINUTE, HOUR, DAY, MONTH, YEAR and ZONE to internal time. 1774 doc: /* Convert SECOND, MINUTE, HOUR, DAY, MONTH, YEAR and ZONE to internal time.
1775 This is the reverse operation of `decode-time', which see. 1775 This is the reverse operation of `decode-time', which see.
1776 ZONE defaults to the current time zone rule. This can 1776 ZONE defaults to the current time zone rule. This can
1777 be a string or t (as from `set-time-zone-rule'), or it can be a list 1777 be a string or t (as from `set-time-zone-rule'), or it can be a list
1778 \(as from `current-time-zone') or an integer (as from `decode-time') 1778 \(as from `current-time-zone') or an integer (as from `decode-time')
1779 applied without consideration for daylight savings time. 1779 applied without consideration for daylight saving time.
1780 1780
1781 You can pass more than 7 arguments; then the first six arguments 1781 You can pass more than 7 arguments; then the first six arguments
1782 are used as SECOND through YEAR, and the *last* argument is used as ZONE. 1782 are used as SECOND through YEAR, and the *last* argument is used as ZONE.
1783 The intervening arguments are ignored. 1783 The intervening arguments are ignored.
1784 This feature lets (apply 'encode-time (decode-time ...)) work. 1784 This feature lets (apply 'encode-time (decode-time ...)) work.