summaryrefslogtreecommitdiff
path: root/lisp/calendar/iso8601.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/calendar/iso8601.el')
-rw-r--r--lisp/calendar/iso8601.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/calendar/iso8601.el b/lisp/calendar/iso8601.el
index 0f42c824e32..f8949914f78 100644
--- a/lisp/calendar/iso8601.el
+++ b/lisp/calendar/iso8601.el
@@ -83,7 +83,7 @@
iso8601--ordinal-date-match)))
(defconst iso8601--time-match
- "\\([0-9][0-9]\\):?\\([0-9][0-9]\\)?:?\\([0-9][0-9]\\)?\\.?\\([0-9][0-9][0-9]\\)?")
+ "\\([0-9][0-9]\\):?\\([0-9][0-9]\\)?:?\\([0-9][0-9]\\)?[.,]?\\([0-9]+\\)?")
(defconst iso8601--zone-match
"\\(Z\\|\\([-+]\\)\\([0-9][0-9]\\):?\\([0-9][0-9]\\)?\\)")
@@ -232,7 +232,7 @@ well as variants like \"2008W32\" (week number) and
(string-to-number (match-string 3 time))))
;; Hm...
(_millisecond (and (match-string 4 time)
- (string-to-number (match-string 4 time)))))
+ (string-to-number (match-string 4 time)))))
(iso8601--decoded-time :hour hour
:minute (or minute 0)
:second (or second 0)