aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Mackenzie2019-08-02 12:57:40 +0000
committerAlan Mackenzie2019-08-02 12:57:40 +0000
commit87ec668e95084af45bec010de36493fb90a26461 (patch)
treeac8016b7b3ec328ebf07b3910039b348e3dd9b28
parent3975eb46150a6c896319b350112c036c678cfc38 (diff)
downloademacs-87ec668e95084af45bec010de36493fb90a26461.tar.gz
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.
-rw-r--r--lisp/progmodes/cc-langs.el2
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."
1542 1542
1543(c-lang-defconst c-pre-lambda-tokens-re 1543(c-lang-defconst c-pre-lambda-tokens-re
1544 ;; Regexp matching any token in the list `c-pre-lambda-tokens'. 1544 ;; Regexp matching any token in the list `c-pre-lambda-tokens'.
1545 t (regexp-opt (c-lang-const c-pre-lambda-tokens))) 1545 t (c-make-keywords-re t (c-lang-const c-pre-lambda-tokens)))
1546(c-lang-defvar c-pre-lambda-tokens-re (c-lang-const c-pre-lambda-tokens-re)) 1546(c-lang-defvar c-pre-lambda-tokens-re (c-lang-const c-pre-lambda-tokens-re))
1547 1547
1548;;; Syntactic whitespace. 1548;;; Syntactic whitespace.