Mercurial > emacs
comparison lisp/calendar/time-date.el @ 65824:4f45bcb69451
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-572
Merge from gnus--rel--5.10
Patches applied:
* gnus--rel--5.10 (patch 129-130)
- Update from CVS
2005-09-30 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/time-date.el: Autoload parse-time-string, XEmacs needs it.
author | Miles Bader <miles@gnu.org> |
---|---|
date | Tue, 04 Oct 2005 13:55:17 +0000 |
parents | 18a818a2ee7c |
children | a55ee709ec8d aa89c814f853 |
comparison
equal
deleted
inserted
replaced
65823:907b956a6bb2 | 65824:4f45bcb69451 |
---|---|
89 (cond | 89 (cond |
90 ((eq type 0) (cons high low)) | 90 ((eq type 0) (cons high low)) |
91 ((eq type 1) (list high low)) | 91 ((eq type 1) (list high low)) |
92 ((eq type 2) (list high low micro)))) | 92 ((eq type 2) (list high low micro)))) |
93 | 93 |
94 (autoload 'parse-time-string "parse-time") | |
94 (autoload 'timezone-make-date-arpa-standard "timezone") | 95 (autoload 'timezone-make-date-arpa-standard "timezone") |
95 | 96 |
96 ;;;###autoload | 97 ;;;###autoload |
97 (defun date-to-time (date) | 98 (defun date-to-time (date) |
98 "Parse a string that represents a date-time and return a time value." | 99 "Parse a string that represents a date-time and return a time value." |