From 87ec668e95084af45bec010de36493fb90a26461 Mon Sep 17 00:00:00 2001 From: Alan Mackenzie Date: Fri, 2 Aug 2019 12:57:40 +0000 Subject: [PATCH] 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. --- lisp/progmodes/cc-langs.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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. -- 2.39.2