* calendar/parse-time.el (parse-time-string): Allow extractor to

return nil.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 764efc4d640ee4f073f039dd83264c8be98dc9fa..8c502a3affc7ed41ae74fc9247d26a322930f624 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-25  Andreas Schwab  <schwab@linux-m68k.org>
+
+       * calendar/parse-time.el (parse-time-string): Allow extractor to
+       return nil.
+
 2012-02-25  Michael Albinus  <michael.albinus@gmx.de>
 
        * net/tramp.el (tramp-file-name-for-operation): Add

diff --git a/lisp/calendar/parse-time.el b/lisp/calendar/parse-time.el
index ab513517452c264e12f9f9996b63331757d47f81..baf920655503e4aea625e65057073f167dec46b4 100644 (file)
--- a/lisp/calendar/parse-time.el
+++ b/lisp/calendar/parse-time.el
@@ -193,28 +193,29 @@ unknown are returned as nil."
                 (predicate (pop rule))
                 (parse-time-val))
            (when (and (not (nth (car slots) time)) ;not already set
-                      (setq parse-time-val (cond ((and (consp predicate)
-                                            (not (eq (car predicate)
-                                                     'lambda)))
-                                       (and (numberp parse-time-elt)
-                                            (<= (car predicate) parse-time-elt)
-                                            (<= parse-time-elt (cadr predicate))
-                                            parse-time-elt))
-                                      ((symbolp predicate)
-                                       (cdr (assoc parse-time-elt
-                                                   (symbol-value predicate))))
-                                      ((funcall predicate)))))
+                      (setq parse-time-val
+                            (cond ((and (consp predicate)
+                                        (not (eq (car predicate)
+                                                 'lambda)))
+                                   (and (numberp parse-time-elt)
+                                        (<= (car predicate) parse-time-elt)
+                                        (<= parse-time-elt (cadr predicate))
+                                        parse-time-elt))
+                                  ((symbolp predicate)
+                                   (cdr (assoc parse-time-elt
+                                               (symbol-value predicate))))
+                                  ((funcall predicate)))))
              (setq exit t)
              (while slots
-               (let ((new-val (and rule
-                                   (let ((this (pop rule)))
-                                     (if (vectorp this)
-                                         (parse-integer
-                                          parse-time-elt
-                                          (aref this 0) (aref this 1))
-                                       (funcall this))))))
-                 (rplaca (nthcdr (pop slots) time)
-                         (or new-val parse-time-val)))))))))
+               (let ((new-val (if rule
+                                  (let ((this (pop rule)))
+                                    (if (vectorp this)
+                                        (parse-integer
+                                         parse-time-elt
+                                         (aref this 0) (aref this 1))
+                                      (funcall this)))
+                                parse-time-val)))
+                 (rplaca (nthcdr (pop slots) time) new-val))))))))
     time))
 
 (provide 'parse-time)