Don't complain about the regexp "[:-:]"

Suggested by Clément Pit-Claudel.

* src/regex-emacs.c (regex_compile):
* test/src/regex-emacs-tests.el (regexp-invalid): Tolerate ranges.

diff --git a/src/regex-emacs.c b/src/regex-emacs.c
index 38824370e056cc78eb332537b402b13cafb231d6..794958eb461c1954ced6aa10c8ac11f65e6b0c7c 100644 (file)
--- a/src/regex-emacs.c
+++ b/src/regex-emacs.c
@@ -2007,7 +2007,7 @@ regex_compile (re_char *pattern, ptrdiff_t size,
             if (*p == ':')
               {
                 re_char *q = p + 1;
-                while (q != pend && *q != ']')
+                while (q != pend && *q != ']' && *q != '-')
                   {
                     if (*q == ':')
                       {

diff --git a/test/src/regex-emacs-tests.el b/test/src/regex-emacs-tests.el
index 661d416e6a72b1562e0027ade6439525d3fd53b3..f1c703ab8bd6937f7ffaa7561ab495e3e7a17ef8 100644 (file)
--- a/test/src/regex-emacs-tests.el
+++ b/test/src/regex-emacs-tests.el
@@ -806,6 +806,7 @@ This evaluates the TESTS test cases from glibc."
 (ert-deftest regexp-invalid ()
   ;; relint suppression: Duplicated
   (should-error (string-match "[:space:]" "")
-                :type 'invalid-regexp))
+                :type 'invalid-regexp)
+  (should (equal (string-match "[:-:]" "a-:") 2)))
 
 ;;; regex-emacs-tests.el ends here