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.

diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el
index f3dd0c6c4c9d5337d0641e2d5a68236c66745121..9d36f8f9e49c2ff50a767b80ca49f27bca05445e 100644 (file)
--- 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))
 \f
 ;;; Syntactic whitespace.