From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Sun, 29 Sep 2019 11:03:08 +0000 (+0200)
Subject: Fix up iso8601 time match regexp
X-Git-Tag: emacs-27.0.90~1380
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=96636a8e1f5e91edb8ac4e88e0723beb7c71e160;p=emacs.git

Fix up iso8601 time match regexp

* lisp/calendar/iso8601.el (iso8601--time-match): The fraction
mark can be either . or , and there can be arbitrarily many digits
in the fraction.
---

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)