[Emacs-diffs] Changes to emacs/src/editfns.c

[Luc Teirlinck]

Index: emacs/src/editfns.c
diff -c emacs/src/editfns.c:1.375 emacs/src/editfns.c:1.376
*** emacs/src/editfns.c:1.375   Mon Jun 21 21:54:30 2004
--- emacs/src/editfns.c Fri Jul  9 23:34:28 2004
***************
*** 1431,1440 ****
  DEFUN ("float-time", Ffloat_time, Sfloat_time, 0, 1, 0,
         doc: /* Return the current time, as a float number of seconds since 
the epoch.
  If SPECIFIED-TIME is given, it is the time to convert to float
! instead of the current time.  The argument should have the forms:
!  (HIGH . LOW) or (HIGH LOW USEC) or (HIGH LOW . USEC).
! Thus, you can use times obtained from `current-time'
! and from `file-attributes'.
  
  WARNING: Since the result is floating point, it may not be exact.
  Do not use this function if precise time stamps are required.  */)
--- 1431,1440 ----
  DEFUN ("float-time", Ffloat_time, Sfloat_time, 0, 1, 0,
         doc: /* Return the current time, as a float number of seconds since 
the epoch.
  If SPECIFIED-TIME is given, it is the time to convert to float
! instead of the current time.  The argument should have the form
! (HIGH LOW . IGNORED). Thus, you can use times obtained from
! `current-time' and from `file-attributes'.  SPECIFIED-TIME can also
! have the form (HIGH . LOW), but this is considered obsolete.
  
  WARNING: Since the result is floating point, it may not be exact.
  Do not use this function if precise time stamps are required.  */)
***************
*** 1506,1513 ****
  
  DEFUN ("format-time-string", Fformat_time_string, Sformat_time_string, 1, 3, 
0,
         doc: /* Use FORMAT-STRING to format the time TIME, or now if omitted.
! TIME is specified as (HIGH LOW . IGNORED) or (HIGH . LOW), as returned by
! `current-time' or `file-attributes'.
  The third, optional, argument UNIVERSAL, if non-nil, means describe TIME
  as Universal Time; nil means describe TIME in the local time zone.
  The value is a copy of FORMAT-STRING, but with certain constructs replaced
--- 1506,1514 ----
  
  DEFUN ("format-time-string", Fformat_time_string, Sformat_time_string, 1, 3, 
0,
         doc: /* Use FORMAT-STRING to format the time TIME, or now if omitted.
! TIME is specified as (HIGH LOW . IGNORED), as returned by
! `current-time' or `file-attributes'.  The obsolete form (HIGH . LOW)
! is also still accepted.
  The third, optional, argument UNIVERSAL, if non-nil, means describe TIME
  as Universal Time; nil means describe TIME in the local time zone.
  The value is a copy of FORMAT-STRING, but with certain constructs replaced
***************
*** 1603,1619 ****
  
  DEFUN ("decode-time", Fdecode_time, Sdecode_time, 0, 1, 0,
         doc: /* Decode a time value as (SEC MINUTE HOUR DAY MONTH YEAR DOW DST 
ZONE).
! The optional SPECIFIED-TIME should be a list of (HIGH LOW . IGNORED)
! or (HIGH . LOW), as from `current-time' and `file-attributes', or `nil'
! to use the current time.  The list has the following nine members:
! SEC is an integer between 0 and 60; SEC is 60 for a leap second, which
! only some operating systems support.  MINUTE is an integer between 0 and 59.
! HOUR is an integer 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, 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.)  */)
       (specified_time)
       Lisp_Object specified_time;
  {
--- 1604,1622 ----
  
  DEFUN ("decode-time", Fdecode_time, Sdecode_time, 0, 1, 0,
         doc: /* Decode a time value as (SEC MINUTE HOUR DAY MONTH YEAR DOW DST 
ZONE).
! The optional SPECIFIED-TIME should be a list of (HIGH LOW . IGNORED),
! as from `current-time' and `file-attributes', or `nil' to use the
! current time.  The obsolete form (HIGH . LOW) is also still accepted.
! The list has the following nine members: SEC is an integer between 0
! and 60; SEC is 60 for a leap second, which only some operating systems
! support.  MINUTE is an integer between 0 and 59.  HOUR is an integer
! 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,
! 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.)  */)
       (specified_time)
       Lisp_Object specified_time;
  {
***************
*** 1745,1757 ****
  However, see also the functions `decode-time' and `format-time-string'
  which provide a much more powerful and general facility.
  
! If SPECIFIED-TIME is given, it is a time to format instead
! of the current time.  The argument should have the form:
!   (HIGH . LOW)
! or the form:
!   (HIGH LOW . IGNORED).
! Thus, you can use times obtained from `current-time'
! and from `file-attributes'.  */)
       (specified_time)
       Lisp_Object specified_time;
  {
--- 1748,1758 ----
  However, see also the functions `decode-time' and `format-time-string'
  which provide a much more powerful and general facility.
  
! If SPECIFIED-TIME is given, it is a time to format instead of the
! current time.  The argument should have the form (HIGH LOW . IGNORED).
! Thus, you can use times obtained from `current-time' and from
! `file-attributes'.  SPECIFIED-TIME can also have the form (HIGH . LOW),
! but this is considered obsolete.  */)
       (specified_time)
       Lisp_Object specified_time;
  {
***************
*** 1802,1813 ****
      A negative value means west of Greenwich.
  NAME is a string giving the name of the time zone.
  If SPECIFIED-TIME is given, the time zone offset is determined from it
! instead of using the current time.  The argument should have the form:
!   (HIGH . LOW)
! or the form:
!   (HIGH LOW . IGNORED).
! Thus, you can use times obtained from `current-time'
! and from `file-attributes'.
  
  Some operating systems cannot provide all this information to Emacs;
  in this case, `current-time-zone' returns a list containing nil for
--- 1803,1812 ----
      A negative value means west of Greenwich.
  NAME is a string giving the name of the time zone.
  If SPECIFIED-TIME is given, the time zone offset is determined from it
! instead of using the current time.  The argument should have the form
! (HIGH LOW . IGNORED).  Thus, you can use times obtained from
! `current-time' and from `file-attributes'.  SPECIFIED-TIME can also
! have the form (HIGH . LOW), but this is considered obsolete.
  
  Some operating systems cannot provide all this information to Emacs;
  in this case, `current-time-zone' returns a list containing nil for