[Cmake-commits] CMake branch, next, updated. v3.1.0-rc1-545-g543debd

[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  543debd6d2cf63c6f5f5b2bf3b5b5c614bb4bbb5 (commit)
       via  30f14aebeee90bc1af6236888599db86b2bd8fae (commit)
      from  78c1535a1f54c3a56c22b7118197372a4286b859 (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=543debd6d2cf63c6f5f5b2bf3b5b5c614bb4bbb5
commit 543debd6d2cf63c6f5f5b2bf3b5b5c614bb4bbb5
Merge: 78c1535 30f14ae
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Nov 12 08:43:06 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Nov 12 08:43:06 2014 -0500

    Merge topic 'emacs-mode-underscore-in-symbol' into next
    
    30f14aeb cmake-mode.el: syntax of '_' should be treated as symbol


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=30f14aebeee90bc1af6236888599db86b2bd8fae
commit 30f14aebeee90bc1af6236888599db86b2bd8fae
Author:     Syohei YOSHIDA <syohex at gmail.com>
AuthorDate: Wed Nov 12 16:17:07 2014 +0900
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Nov 12 08:40:14 2014 -0500

    cmake-mode.el: syntax of '_' should be treated as symbol
    
    Word commands, such as foward-word(M-f), backward-kill-word(M-backspace),
    don't work well like other major-modes if syntax of '_' is treated as "word".
    
    Tested-by: Guillaume Papin <guillaume.papin at parrot.com>

diff --git a/Auxiliary/cmake-mode.el b/Auxiliary/cmake-mode.el
index c8b9f8b..f1470f3 100644
--- a/Auxiliary/cmake-mode.el
+++ b/Auxiliary/cmake-mode.el
@@ -202,7 +202,7 @@ the indentation.  Otherwise it retains the same position on the line"
 ;; Keyword highlighting regex-to-face map.
 ;;
 (defconst cmake-font-lock-keywords
-  (list '("^[ \t]*\\(\\w+\\)[ \t]*(" 1 font-lock-function-name-face))
+  (list '("^[ \t]*\\([[:word:]_]+\\)[ \t]*(" 1 font-lock-function-name-face))
   "Highlighting expressions for CMAKE mode."
   )
 
@@ -241,7 +241,6 @@ the indentation.  Otherwise it retains the same position on the line"
   ; Create the syntax table
   (setq cmake-mode-syntax-table (make-syntax-table))
   (set-syntax-table cmake-mode-syntax-table)
-  (modify-syntax-entry ?_  "w" cmake-mode-syntax-table)
   (modify-syntax-entry ?\(  "()" cmake-mode-syntax-table)
   (modify-syntax-entry ?\)  ")(" cmake-mode-syntax-table)
   (modify-syntax-entry ?# "<" cmake-mode-syntax-table)

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

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


hooks/post-receive
-- 
CMake