diff options
| author | Mattias Engdegård | 2020-02-26 22:59:22 +0100 |
|---|---|---|
| committer | Mattias Engdegård | 2020-02-26 22:59:22 +0100 |
| commit | 3766bf728a43933083f4525970bcf9fdace3838d (patch) | |
| tree | 34f1a94f379bac2b2f6fa28866de6e30da1dbd7d | |
| parent | 8d5e8cddab732ac90e9ae930c63f7830f9dab24f (diff) | |
| download | emacs-3766bf728a43933083f4525970bcf9fdace3838d.tar.gz emacs-3766bf728a43933083f4525970bcf9fdace3838d.zip | |
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.
| -rw-r--r-- | src/regex-emacs.c | 2 | ||||
| -rw-r--r-- | test/src/regex-emacs-tests.el | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/regex-emacs.c b/src/regex-emacs.c index 38824370e05..794958eb461 100644 --- a/src/regex-emacs.c +++ b/src/regex-emacs.c | |||
| @@ -2007,7 +2007,7 @@ regex_compile (re_char *pattern, ptrdiff_t size, | |||
| 2007 | if (*p == ':') | 2007 | if (*p == ':') |
| 2008 | { | 2008 | { |
| 2009 | re_char *q = p + 1; | 2009 | re_char *q = p + 1; |
| 2010 | while (q != pend && *q != ']') | 2010 | while (q != pend && *q != ']' && *q != '-') |
| 2011 | { | 2011 | { |
| 2012 | if (*q == ':') | 2012 | if (*q == ':') |
| 2013 | { | 2013 | { |
diff --git a/test/src/regex-emacs-tests.el b/test/src/regex-emacs-tests.el index 661d416e6a7..f1c703ab8bd 100644 --- 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." | |||
| 806 | (ert-deftest regexp-invalid () | 806 | (ert-deftest regexp-invalid () |
| 807 | ;; relint suppression: Duplicated | 807 | ;; relint suppression: Duplicated |
| 808 | (should-error (string-match "[:space:]" "") | 808 | (should-error (string-match "[:space:]" "") |
| 809 | :type 'invalid-regexp)) | 809 | :type 'invalid-regexp) |
| 810 | (should (equal (string-match "[:-:]" "a-:") 2))) | ||
| 810 | 811 | ||
| 811 | ;;; regex-emacs-tests.el ends here | 812 | ;;; regex-emacs-tests.el ends here |