Mercurial > emacs
comparison lisp/calendar/time-date.el @ 106907:9d769a0fc9cd
Merge from trunk
| author | Jan D. <jan.h.d@swipnet.se> |
|---|---|
| date | Tue, 19 Jan 2010 11:52:59 +0100 |
| parents | e3970f7c14d4 |
| children | 8d09094063d0 376148b31b5e |
comparison
equal
deleted
inserted
replaced
| 106857:f12233437424 | 106907:9d769a0fc9cd |
|---|---|
| 96 (autoload 'parse-time-string "parse-time") | 96 (autoload 'parse-time-string "parse-time") |
| 97 (autoload 'timezone-make-date-arpa-standard "timezone") | 97 (autoload 'timezone-make-date-arpa-standard "timezone") |
| 98 | 98 |
| 99 ;;;###autoload | 99 ;;;###autoload |
| 100 (defun date-to-time (date) | 100 (defun date-to-time (date) |
| 101 "Parse a string DATE that represents a date-time and return a time value." | 101 "Parse a string DATE that represents a date-time and return a time value. |
| 102 If DATE lacks timezone information, GMT is assumed." | |
| 102 (condition-case () | 103 (condition-case () |
| 103 (apply 'encode-time | 104 (apply 'encode-time |
| 104 (parse-time-string | 105 (parse-time-string |
| 105 ;; `parse-time-string' isn't sufficiently general or | 106 ;; `parse-time-string' isn't sufficiently general or |
| 106 ;; robust. It fails to grok some of the formats that | 107 ;; robust. It fails to grok some of the formats that |