diff options
| author | Alan Mackenzie <acm@muc.de> | 2019-08-02 12:57:40 +0000 |
|---|---|---|
| committer | Alan Mackenzie <acm@muc.de> | 2019-08-02 12:57:40 +0000 |
| commit | 87ec668e95084af45bec010de36493fb90a26461 (patch) | |
| tree | ac8016b7b3ec328ebf07b3910039b348e3dd9b28 /lisp/progmodes/cc-langs.el | |
| parent | 3975eb46150a6c896319b350112c036c678cfc38 (diff) | |
| download | emacs-87ec668e95084af45bec010de36493fb90a26461.tar.gz emacs-87ec668e95084af45bec010de36493fb90a26461.tar.bz2 emacs-87ec668e95084af45bec010de36493fb90a26461.zip | |
CC Mode: Fix spurious recognition of operators beginning with, e.g. "or"
This fixes bug #36801.
* lisp/progmodes/cc-langs.el (c-pre-lambda-tokens-re): Use c-make-keywords-re
rather than regexp-opt to make an optimised regexp out of a list of tokens.
Diffstat (limited to 'lisp/progmodes/cc-langs.el')
| -rw-r--r-- | lisp/progmodes/cc-langs.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el index f3dd0c6c4c9..9d36f8f9e49 100644 --- a/lisp/progmodes/cc-langs.el +++ b/lisp/progmodes/cc-langs.el @@ -1542,7 +1542,7 @@ Currently (2016-08) only used in C++ mode." (c-lang-defconst c-pre-lambda-tokens-re ;; Regexp matching any token in the list `c-pre-lambda-tokens'. - t (regexp-opt (c-lang-const c-pre-lambda-tokens))) + t (c-make-keywords-re t (c-lang-const c-pre-lambda-tokens))) (c-lang-defvar c-pre-lambda-tokens-re (c-lang-const c-pre-lambda-tokens-re)) ;;; Syntactic whitespace. |