[Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-224-g7336ce6

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  7336ce66bf26816ca7469120bb958cdb5e01f50f (commit)
       via  a935745d0730cf1cd6c1a880d71e36a39ad86f8c (commit)
      from  90bde57cdb2e8fbb7690af011b888c8ac12ef74e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7336ce66bf26816ca7469120bb958cdb5e01f50f
commit 7336ce66bf26816ca7469120bb958cdb5e01f50f
Merge: 90bde57 a935745
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 8 14:23:11 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 8 14:23:11 2015 -0400

    Merge topic 'emacs-mode-fix-accidental-indentation' into next
    
    a935745d cmake-mode.el: treat keywords as symbols


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a935745d0730cf1cd6c1a880d71e36a39ad86f8c
commit a935745d0730cf1cd6c1a880d71e36a39ad86f8c
Author:     Kevin Burge <kevin.burge at systemware.com>
AuthorDate: Thu Oct 8 12:49:00 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 8 14:21:20 2015 -0400

    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).

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))))

-----------------------------------------------------------------------

Summary of changes:
 Auxiliary/cmake-mode.el |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake