summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-10-12 14:29:56 (GMT)
committerBrad King <brad.king@kitware.com>2015-10-12 14:29:56 (GMT)
commit1ee948d41890b320a26bddb5659aa74aaa892d3d (patch)
tree7af44aaef6f9efc2fab57ee20b7ae56b762eeffc
parente33fe7910fdf56816b3252e1933643d870f8f073 (diff)
parenta935745d0730cf1cd6c1a880d71e36a39ad86f8c (diff)
downloadCMake-1ee948d41890b320a26bddb5659aa74aaa892d3d.zip
CMake-1ee948d41890b320a26bddb5659aa74aaa892d3d.tar.gz
CMake-1ee948d41890b320a26bddb5659aa74aaa892d3d.tar.bz2
Merge branch 'emacs-mode-fix-accidental-indentation' into release
-rw-r--r--Auxiliary/cmake-mode.el8
1 files changed, 4 insertions, 4 deletions
diff --git a/Auxiliary/cmake-mode.el b/Auxiliary/cmake-mode.el
index 11e33b3..e50ae7b 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))))