Merge branch 'master' of https://git.gnus.org/gnus

[gnus] / lisp / time-date.el

diff --git a/lisp/time-date.el b/lisp/time-date.el
index 6429350..52727d7 100644 (file)
--- a/lisp/time-date.el
+++ b/lisp/time-date.el
@@ -39,9 +39,6 @@
 
 ;;; Code:
 
-;; Only necessary for `declare' when compiling Gnus with Emacs 21.
-(eval-when-compile (require 'cl))
-
 (defmacro with-decoded-time-value (varlist &rest body)
   "Decode a time value and bind it according to VARLIST, then eval BODY.
 
@@ -97,20 +94,20 @@ and type 2 is the list (HIGH LOW MICRO)."
 (autoload 'timezone-make-date-arpa-standard "timezone")
 
 ;;;###autoload
+;; `parse-time-string' isn't sufficiently general or robust.  It fails
+;; to grok some of the formats that timezone does (e.g. dodgy
+;; post-2000 stuff from some Elms) and either fails or returns bogus
+;; values.  timezone-make-date-arpa-standard should help.
 (defun date-to-time (date)
   "Parse a string DATE that represents a date-time and return a time value.
 If DATE lacks timezone information, GMT is assumed."
   (condition-case ()
-      (apply 'encode-time
-            (parse-time-string
-             ;; `parse-time-string' isn't sufficiently general or
-             ;; robust.  It fails to grok some of the formats that
-             ;; timezone does (e.g. dodgy post-2000 stuff from some
-             ;; Elms) and either fails or returns bogus values.  Lars
-             ;; reverted this change, but that loses non-trivially
-             ;; often for me.  -- fx
-             (timezone-make-date-arpa-standard date)))
-    (error (error "Invalid date: %s" date))))
+      (apply 'encode-time (parse-time-string date))
+    (error (condition-case ()
+              (apply 'encode-time
+                     (parse-time-string
+                      (timezone-make-date-arpa-standard date)))
+            (error (error "Invalid date: %s" date))))))
 
 ;; Bit of a mess.  Emacs has float-time since at least 21.1.
 ;; This file is synced to Gnus, and XEmacs packages may have been written
@@ -317,10 +314,10 @@ This function does not work for SECONDS greater than `most-positive-fixnum'."
       (setq start (match-end 0)
             spec (match-string 1 string))
       (unless (string-equal spec "%")
-       ;; `assoc-string' is not available in XEmacs or Emacs 21.  So when
-       ;; compiling Gnus (`time-date.el' is part of Gnus) with XEmacs or
-       ;; Emacs 21, we get a warning here.  But `format-seconds' is not
-       ;; used anywhere in Gnus so it's not a real problem. --rsteib
+       ;; `assoc-string' is not available in XEmacs.  So when compiling
+       ;; Gnus (`time-date.el' is part of Gnus) with XEmacs, we get
+       ;; a warning here.  But `format-seconds' is not used anywhere in
+       ;; Gnus so it's not a real problem. --rsteib
         (or (setq match (assoc-string spec units t))
             (error "Bad format specifier: `%s'" spec))
         (if (assoc-string spec usedunits t)