From: Glenn Morris <rgm@gnu.org>
Date: Fri, 8 Feb 2019 17:20:40 +0000 (-0800)
Subject: Merge from origin/emacs-26
X-Git-Tag: emacs-27.0.90~3646
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0f9940505f87de74c86de17e8a7bf793d9d8dda4;p=emacs.git

Merge from origin/emacs-26

0cd7b52 (origin/emacs-26) Minor improvements to do strings in callproc.c
b8c7017 Improve documentation of 'date-to-time' and 'parse-time-string'
46095a7 Fix downloading of URLs that end in a slash
3b60a0a * doc/misc/eww.texi (Basics): Fix eww keybindings.  (Bug#34291)
8e22025 Fix process-thread docstring
459b669 Fix failures of vc-find-revision with non-ASCII file names
e9ff190 * doc/lispref/tips.texi (Documentation Tips): Fix quotes.  (B...
3e49a08 ; * src/coding.h (struct coding_system): Fix a typo in a comm...
b657286 Add documentation for tabulated-list functions in the elisp m...
6e0f67b Fix URL in ucs-normalize.el
ce3ae1f * etc/PROBLEMS: Amend entry for profiler bug #34235 to mentio...

# Conflicts:
#	doc/lispref/os.texi
---

0f9940505f87de74c86de17e8a7bf793d9d8dda4
diff --cc doc/lispref/os.texi
index 6fae93717a2,2f3e91ce68c..9766b8321fa
--- a/doc/lispref/os.texi
+++ b/doc/lispref/os.texi
@@@ -1544,7 -1467,28 +1544,28 @@@ Time values include @code{nil}, numbers
  
  @defun date-to-time string
  This function parses the time-string @var{string} and returns the
- corresponding Lisp timestamp.
 -corresponding time value.  The argument @var{string} should represent
++corresponding Lisp timestamp.  The argument @var{string} should represent
+ a date-time, and should be in one of the forms recognized by
+ @code{parse-time-string} (see below).  This function assumes the GMT
+ timezone if @var{string} lacks an explicit timezone information.
+ @end defun
+ 
+ @defun parse-time-string string
+ This function parses the time-string @var{string} into a list of the
+ following form:
+ 
+ @example
+ (@var{sec} @var{min} @var{hour} @var{day} @var{mon} @var{year} @var{dow} @var{dst} @var{tz})
+ @end example
+ 
+ @noindent
+ The format of this list is the same as what @code{decode-time} accepts
+ (@pxref{Time Conversion}), and is described in more detail there.  Any
+ element that cannot be determined from the input will be set to
+ @code{nil}.  The argument @var{string} should resemble an RFC 2822 or
+ ISO 8601 string, like ``Fri, 25 Mar 2016 16:24:56 +0100'' or
+ ``1998-09-12T12:21:54-0200'', but this function will attempt to parse
+ less well-formed time strings as well.
  @end defun
  
  @defun format-time-string format-string &optional time zone