diff options
| author | Mattias EngdegÄrd | 2019-02-10 10:39:00 +0100 |
|---|---|---|
| committer | Mattias EngdegÄrd | 2019-02-10 23:36:42 +0100 |
| commit | c8c6ad2429db961fb9410b25fec44b45da96efa1 (patch) | |
| tree | 00c681e20008d527ed8cb585540ec3ac09ecb8b8 | |
| parent | 459869a528ff02787255391ab90f68195c27b807 (diff) | |
| download | emacs-c8c6ad2429db961fb9410b25fec44b45da96efa1.tar.gz emacs-c8c6ad2429db961fb9410b25fec44b45da96efa1.zip | |
Document that [:cntrl:] does not match DEL (Bug#34391)
* doc/lispref/searching.texi (Character Classes):
* lisp/emacs-lisp/rx.el (rx):
Document that [:cntrl:] excludes DEL.
* test/src/regex-emacs-tests.el (regex-tests-PTESTS-whitelist):
Swap misplaced comments and fix wrong code for DEL.
| -rw-r--r-- | doc/lispref/searching.texi | 2 | ||||
| -rw-r--r-- | lisp/emacs-lisp/rx.el | 2 | ||||
| -rw-r--r-- | test/src/regex-emacs-tests.el | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/doc/lispref/searching.texi b/doc/lispref/searching.texi index 05fc3282053..cfbd2449b13 100644 --- a/doc/lispref/searching.texi +++ b/doc/lispref/searching.texi | |||
| @@ -559,7 +559,7 @@ tabs, and other characters whose Unicode @samp{general-category} | |||
| 559 | property (@pxref{Character Properties}) indicates they are spacing | 559 | property (@pxref{Character Properties}) indicates they are spacing |
| 560 | separators. | 560 | separators. |
| 561 | @item [:cntrl:] | 561 | @item [:cntrl:] |
| 562 | This matches any @acronym{ASCII} control character. | 562 | This matches any character whose code is in the range 0--31. |
| 563 | @item [:digit:] | 563 | @item [:digit:] |
| 564 | This matches @samp{0} through @samp{9}. Thus, @samp{[-+[:digit:]]} | 564 | This matches @samp{0} through @samp{9}. Thus, @samp{[-+[:digit:]]} |
| 565 | matches any digit, as well as @samp{+} and @samp{-}. | 565 | matches any digit, as well as @samp{+} and @samp{-}. |
diff --git a/lisp/emacs-lisp/rx.el b/lisp/emacs-lisp/rx.el index 8b4551d0d36..3fa0204a1a2 100644 --- a/lisp/emacs-lisp/rx.el +++ b/lisp/emacs-lisp/rx.el | |||
| @@ -964,7 +964,7 @@ CHAR | |||
| 964 | matches 0 through 9. | 964 | matches 0 through 9. |
| 965 | 965 | ||
| 966 | `control', `cntrl' | 966 | `control', `cntrl' |
| 967 | matches ASCII control characters. | 967 | matches any character whose code is in the range 0-31. |
| 968 | 968 | ||
| 969 | `hex-digit', `hex', `xdigit' | 969 | `hex-digit', `hex', `xdigit' |
| 970 | matches 0 through 9, a through f and A through F. | 970 | matches 0 through 9, a through f and A through F. |
diff --git a/test/src/regex-emacs-tests.el b/test/src/regex-emacs-tests.el index e84af6b131b..9a403165734 100644 --- a/test/src/regex-emacs-tests.el +++ b/test/src/regex-emacs-tests.el | |||
| @@ -555,11 +555,11 @@ differences in behavior.") | |||
| 555 | 555 | ||
| 556 | (defconst regex-tests-PTESTS-whitelist | 556 | (defconst regex-tests-PTESTS-whitelist |
| 557 | [ | 557 | [ |
| 558 | ;; emacs doesn't barf on weird ranges such as [b-a], but simply | 558 | ;; emacs doesn't see DEL (0x7f) as a [:cntrl:] character |
| 559 | ;; fails to match | ||
| 560 | 138 | 559 | 138 |
| 561 | 560 | ||
| 562 | ;; emacs doesn't see DEL (0x78) as a [:cntrl:] character | 561 | ;; emacs doesn't barf on weird ranges such as [b-a], but simply |
| 562 | ;; fails to match | ||
| 563 | 168 | 563 | 168 |
| 564 | ] | 564 | ] |
| 565 | "Line numbers in the PTESTS test that should be skipped. These | 565 | "Line numbers in the PTESTS test that should be skipped. These |