From a935745d0730cf1cd6c1a880d71e36a39ad86f8c Mon Sep 17 00:00:00 2001 From: Kevin Burge Date: Thu, 8 Oct 2015 12:49:00 -0500 Subject: [PATCH] cmake-mode.el: treat keywords as symbols Symbols such as "CHECK_FUNCTION_EXISTS" should not trigger an open block (due to containing the "word" FUNCTION). Fix this regression caused by commit v3.4.0-rc1~292^2~3 (cmake-mode.el: Use `rx' for regexps, 2015-07-23). --- Auxiliary/cmake-mode.el | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Auxiliary/cmake-mode.el b/Auxiliary/cmake-mode.el index 11e33b378..e50ae7b95 100644 --- a/Auxiliary/cmake-mode.el +++ b/Auxiliary/cmake-mode.el @@ -70,11 +70,11 @@ set the path with these commands: (defconst cmake-regex-indented (rx-to-string `(and bol (* (group (or (regexp ,cmake-regex-token) (any space ?\n))))))) (defconst cmake-regex-block-open - (rx-to-string `(and bow (or ,@(append cmake-keywords-block-open - (mapcar 'downcase cmake-keywords-block-open))) eow))) + (rx-to-string `(and symbol-start (or ,@(append cmake-keywords-block-open + (mapcar 'downcase cmake-keywords-block-open))) symbol-end))) (defconst cmake-regex-block-close - (rx-to-string `(and bow (or ,@(append cmake-keywords-block-close - (mapcar 'downcase cmake-keywords-block-close))) eow))) + (rx-to-string `(and symbol-start (or ,@(append cmake-keywords-block-close + (mapcar 'downcase cmake-keywords-block-close))) symbol-end))) (defconst cmake-regex-close (rx-to-string `(and bol (* space) (regexp ,cmake-regex-block-close) (* space) (regexp ,cmake-regex-paren-left))))