diff options
| author | Glenn Morris | 2019-02-08 09:20:40 -0800 |
|---|---|---|
| committer | Glenn Morris | 2019-02-08 09:20:40 -0800 |
| commit | 0f9940505f87de74c86de17e8a7bf793d9d8dda4 (patch) | |
| tree | 0215c1cc88041710fc32a2d17818e8c66c490ca7 /lisp/calendar | |
| parent | 4f138318d3553162ccc6d0e4554456a65324ec25 (diff) | |
| parent | 0cd7b526a14ead6cbe78df481a2fd975252bb9ac (diff) | |
| download | emacs-0f9940505f87de74c86de17e8a7bf793d9d8dda4.tar.gz emacs-0f9940505f87de74c86de17e8a7bf793d9d8dda4.zip | |
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
Diffstat (limited to 'lisp/calendar')
| -rw-r--r-- | lisp/calendar/time-date.el | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lisp/calendar/time-date.el b/lisp/calendar/time-date.el index 11ad92e7162..6fb0f22427a 100644 --- a/lisp/calendar/time-date.el +++ b/lisp/calendar/time-date.el | |||
| @@ -148,6 +148,7 @@ it is assumed that PICO was omitted and should be treated as zero." | |||
| 148 | ;; values. timezone-make-date-arpa-standard should help. | 148 | ;; values. timezone-make-date-arpa-standard should help. |
| 149 | (defun date-to-time (date) | 149 | (defun date-to-time (date) |
| 150 | "Parse a string DATE that represents a date-time and return a time value. | 150 | "Parse a string DATE that represents a date-time and return a time value. |
| 151 | DATE should be in one of the forms recognized by `parse-time-string'. | ||
| 151 | If DATE lacks timezone information, GMT is assumed." | 152 | If DATE lacks timezone information, GMT is assumed." |
| 152 | (condition-case err | 153 | (condition-case err |
| 153 | (apply 'encode-time (parse-time-string date)) | 154 | (apply 'encode-time (parse-time-string date)) |