diff options
| author | Alan Mackenzie | 2023-06-17 13:19:18 +0000 |
|---|---|---|
| committer | Alan Mackenzie | 2023-06-17 13:19:18 +0000 |
| commit | f47cf7110edf94b7fb7c7a5ffa97e817f7a0e9d1 (patch) | |
| tree | 6635938ffff7ed40e28c44d2b1ffa3babeedd103 | |
| parent | c279369a7a9e373bb4b88feff0a05f56f3c0fa3b (diff) | |
| download | emacs-f47cf7110edf94b7fb7c7a5ffa97e817f7a0e9d1.tar.gz emacs-f47cf7110edf94b7fb7c7a5ffa97e817f7a0e9d1.zip | |
CC Mode: Correct some regexp typos, \\(:? -> \\(?:
This partly corrects bug#64069.
* lisp/progmodes/cc-langs.el (c-ml-string-back-closer-re): Fix
four occurrences, one of which was in a comment, one in a doc
string.
* lisp/progmodes/cc-mode.el (c-or-c++-mode--regexp.): Fix one
occurrence.
| -rw-r--r-- | lisp/progmodes/cc-langs.el | 6 | ||||
| -rw-r--r-- | lisp/progmodes/cc-mode.el | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el index 3b4fdc6e141..ffb8c5c7b16 100644 --- a/lisp/progmodes/cc-langs.el +++ b/lisp/progmodes/cc-langs.el | |||
| @@ -739,11 +739,11 @@ When non-nil, this variable should end in \"\\\\\\==\". Note that | |||
| 739 | such a backward search will match a minimal string, so a | 739 | such a backward search will match a minimal string, so a |
| 740 | \"context character\" is probably needed at the start of the | 740 | \"context character\" is probably needed at the start of the |
| 741 | regexp. The value for csharp-mode would be something like | 741 | regexp. The value for csharp-mode would be something like |
| 742 | \"\\\\(:?\\\\`\\\\|[^\\\"]\\\\)\\\"*\\\\\\==\"." | 742 | \"\\\\(?:\\\\`\\\\|[^\\\"]\\\\)\\\"*\\\\\\==\"." |
| 743 | t nil | 743 | t nil |
| 744 | pike "\\(:?\\`\\|[^\\\"]\\)\\(:?\\\\.\\)*\\=" | 744 | pike "\\(?:\\`\\|[^\\\"]\\)\\(?:\\\\.\\)*\\=" |
| 745 | ;;pike ;; 2 | 745 | ;;pike ;; 2 |
| 746 | ;; "\\(:?\\`\\|[^\"]\\)\"*\\=" | 746 | ;; "\\(?:\\`\\|[^\"]\\)\"*\\=" |
| 747 | ) | 747 | ) |
| 748 | (c-lang-defvar c-ml-string-back-closer-re | 748 | (c-lang-defvar c-ml-string-back-closer-re |
| 749 | (c-lang-const c-ml-string-back-closer-re)) | 749 | (c-lang-const c-ml-string-back-closer-re)) |
diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el index 11a1d3fe6c2..5cf9b7e17f8 100644 --- a/lisp/progmodes/cc-mode.el +++ b/lisp/progmodes/cc-mode.el | |||
| @@ -2859,7 +2859,7 @@ Key bindings: | |||
| 2859 | "\\|" id "::" | 2859 | "\\|" id "::" |
| 2860 | "\\|" id ws-maybe "=\\)" | 2860 | "\\|" id ws-maybe "=\\)" |
| 2861 | "\\|" "\\(?:inline" ws "\\)?namespace" | 2861 | "\\|" "\\(?:inline" ws "\\)?namespace" |
| 2862 | "\\(:?" ws "\\(?:" id "::\\)*" id "\\)?" ws-maybe "{" | 2862 | "\\(?:" ws "\\(?:" id "::\\)*" id "\\)?" ws-maybe "{" |
| 2863 | "\\|" "class" ws id | 2863 | "\\|" "class" ws id |
| 2864 | "\\(?:" ws "final" "\\)?" ws-maybe "[:{;\n]" | 2864 | "\\(?:" ws "final" "\\)?" ws-maybe "[:{;\n]" |
| 2865 | "\\|" "struct" ws id "\\(?:" ws "final" ws-maybe "[:{\n]" | 2865 | "\\|" "struct" ws id "\\(?:" ws "final" ws-maybe "[:{\n]" |