Commit f008086f authored by Andreas Schwab's avatar Andreas Schwab
Browse files

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

return nil.
parent d268b4fe
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
......
......@@ -193,7 +193,8 @@ 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)
(setq parse-time-val
(cond ((and (consp predicate)
(not (eq (car predicate)
'lambda)))
(and (numberp parse-time-elt)
......@@ -206,15 +207,15 @@ unknown are returned as nil."
((funcall predicate)))))
(setq exit t)
(while slots
(let ((new-val (and rule
(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))))))
(rplaca (nthcdr (pop slots) time)
(or new-val parse-time-val)))))))))
(funcall this)))
parse-time-val)))
(rplaca (nthcdr (pop slots) time) new-val))))))))
time))
(provide 'parse-time)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment