[Cmake-commits] CMake branch, next, updated. v3.3.0-2233-g6428e16

[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  6428e163380112586eff21c301f4d4b19d7d0a15 (commit)
       via  64e6bc5ca3bf15239829f18a71511df2f04181b3 (commit)
       via  758664b7ad018aa19072fe5c359a702c472faae2 (commit)
      from  027d00e82a294652a3fb73c04510da8f15bfaacc (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6428e163380112586eff21c301f4d4b19d7d0a15
commit 6428e163380112586eff21c301f4d4b19d7d0a15
Merge: 027d00e 64e6bc5
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Aug 14 10:48:50 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Aug 14 10:48:50 2015 -0400

    Merge topic 'emacs-mode-font-lock' into next
    
    64e6bc5c cmake-mode.el: Refine variable font-lock
    758664b7 cmake-mode.el: Fix function name font-lock


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=64e6bc5ca3bf15239829f18a71511df2f04181b3
commit 64e6bc5ca3bf15239829f18a71511df2f04181b3
Author:     Roy Crihfield <rscrihf at gmail.com>
AuthorDate: Thu Aug 13 10:54:27 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Aug 14 10:16:22 2015 -0400

    cmake-mode.el: Refine variable font-lock
    
    Simplify regexp for variable names, and allow more legal characters.
    Remove `$ *` as legal chars, and allow `- + / .` in names.

diff --git a/Auxiliary/cmake-mode.el b/Auxiliary/cmake-mode.el
index cf82d09..11e33b3 100644
--- a/Auxiliary/cmake-mode.el
+++ b/Auxiliary/cmake-mode.el
@@ -200,7 +200,7 @@ the indentation.  Otherwise it retains the same position on the line"
      . font-lock-keyword-face)
     (,(rx symbol-start (group (+ (or word (syntax symbol)))) (* blank) ?\()
      1 font-lock-function-name-face)
-    ("\\${?\\([[:alpha:]_][[:alnum:]_]*\\|[0-9]+\\|[$*_]\\)"
+    (,(rx "${" (group (+(any alnum "-_+/."))) "}")
      1 font-lock-variable-name-face t)
     )
   "Highlighting expressions for CMake mode.")

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=758664b7ad018aa19072fe5c359a702c472faae2
commit 758664b7ad018aa19072fe5c359a702c472faae2
Author:     Roy Crihfield <rscrihf at gmail.com>
AuthorDate: Thu Aug 13 10:23:34 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Aug 13 15:24:18 2015 -0400

    cmake-mode.el: Fix function name font-lock
    
    Allow space separating name and opening parenthesis.

diff --git a/Auxiliary/cmake-mode.el b/Auxiliary/cmake-mode.el
index 02f0385..cf82d09 100644
--- a/Auxiliary/cmake-mode.el
+++ b/Auxiliary/cmake-mode.el
@@ -198,7 +198,7 @@ the indentation.  Otherwise it retains the same position on the line"
                               ,@(mapcar #'downcase cmake-keywords))
                           symbol-end))
      . font-lock-keyword-face)
-    (,(rx symbol-start (group (+ (or word (syntax symbol)))) ?\()
+    (,(rx symbol-start (group (+ (or word (syntax symbol)))) (* blank) ?\()
      1 font-lock-function-name-face)
     ("\\${?\\([[:alpha:]_][[:alnum:]_]*\\|[0-9]+\\|[$*_]\\)"
      1 font-lock-variable-name-face t)

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

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


hooks/post-receive
-- 
CMake