From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 19 Nov 2016 22:43:25 +0000 (-0800)
Subject: Merge from origin/emacs-25
X-Git-Tag: emacs-26.0.90~1299
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=870c56a0bd8fe51baa2efa20a75b848f2bd27fd4;p=emacs.git

Merge from origin/emacs-25

07f45d7 ; Spelling fix
1a210f0 * admin/release-process: Update versions and blocking bug num...
36bafc9 Improve documentation of functions that accept time values

# Conflicts:
#	admin/release-process
#	src/editfns.c
---

870c56a0bd8fe51baa2efa20a75b848f2bd27fd4
diff --cc src/editfns.c
index 4f6108102db,5cc4a67ab19..70c53830515
--- a/src/editfns.c
+++ b/src/editfns.c
@@@ -2001,16 -1980,14 +2008,17 @@@ emacs_nmemftime (char *s, size_t maxsiz
  }
  
  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.
+        doc: /* Use FORMAT-STRING to format the time TIME, or now if omitted or nil.
  TIME is specified as (HIGH LOW USEC PSEC), as returned by
- `current-time' or `file-attributes'.  The obsolete form (HIGH . LOW)
- is also still accepted.
 -`current-time' or `file-attributes'.
 -It can also be a single integer number of seconds since the epoch.
 -The obsolete form (HIGH . LOW) is also still accepted.
 -The optional ZONE is omitted or nil for Emacs local time,
 -t for Universal Time, `wall' for system wall clock time,
 -or a string as in the TZ environment variable.
++`current-time' or `file-attributes'.  It can also be a single integer
++number of seconds since the epoch.  The obsolete form (HIGH . LOW) is
++also still accepted.
 +
 +The optional ZONE is omitted or nil for Emacs local time, t for
 +Universal Time, `wall' for system wall clock time, or a string as in
 +the TZ environment variable.  It can also be a list (as from
 +`current-time-zone') or an integer (as from `decode-time') applied
 +without consideration for daylight saving time.
  
  The value is a copy of FORMAT-STRING, but with certain constructs replaced
  by text that describes the specified date and time in TIME:
@@@ -2127,13 -2103,12 +2135,14 @@@ DEFUN ("decode-time", Fdecode_time, Sde
         doc: /* Decode a time value as (SEC MINUTE HOUR DAY MONTH YEAR DOW DST UTCOFF).
  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.
 -current time.
 -It can also be a single integer number of seconds since the epoch.
 -The obsolete form (HIGH . LOW) is also still accepted.
++current time.  It can also be a single integer number of seconds since
++the epoch.  The obsolete form (HIGH . LOW) is also still accepted.
 +
  The optional ZONE is omitted or nil for Emacs local time, t for
  Universal Time, `wall' for system wall clock time, or a string as in
 -the TZ environment variable.
 +the TZ environment variable.  It can also be a list (as from
 +`current-time-zone') or an integer (as from `decode-time') applied
 +without consideration for daylight saving 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
@@@ -2253,8 -2230,10 +2262,9 @@@ which provide a much more powerful and 
  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.
 -`file-attributes'.  SPECIFIED-TIME can also be a single integer
 -number of seconds since the epoch.
 -SPECIFIED-TIME can also have the form (HIGH . LOW), but this is
 -considered obsolete.
++`file-attributes'.  SPECIFIED-TIME can also be a single integer number
++of seconds since the epoch.  The obsolete form (HIGH . LOW) is also
++still accepted.
  
  The optional ZONE is omitted or nil for Emacs local time, t for
  Universal Time, `wall' for system wall clock time, or a string as in
@@@ -2334,14 -2311,11 +2344,15 @@@ NAME is a string giving the name of th
  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.
+ `current-time' and from `file-attributes'.  SPECIFIED-TIME can also be
 -a single integer number of seconds since the epoch.  SPECIFIED-TIME can
 -also have the form (HIGH . LOW), but this is considered obsolete.
 -Optional second arg ZONE is omitted or nil for the local time zone, or
 -a string as in the TZ environment variable.
++a single integer number of seconds since the epoch.  The obsolete form
++(HIGH . LOW) is also still accepted.
 +
 +The optional ZONE is omitted or nil for Emacs local time, t for
 +Universal Time, `wall' for system wall clock time, or a string as in
 +the TZ environment variable.  It can also be a list (as from
 +`current-time-zone') or an integer (as from `decode-time') applied
 +without consideration for daylight saving time.
  
  Some operating systems cannot provide all this information to Emacs;
  in this case, `current-time-zone' returns a list containing nil for