diff options
| author | Brad King <brad.king@kitware.com> | 2014-11-12 09:30:15 -0500 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-11-12 09:30:15 -0500 |
| commit | 5d1fe90ed12f16f1af033b01318062a836d1f4e2 (patch) | |
| tree | 2eadc82b18ef152d4937e0c11e820889f9347144 | |
| parent | 5bed08a06d34262c5a0bd4ad985a47705eba115e (diff) | |
| parent | cb80e51346b28c009759c5e55304580ad1a8fc36 (diff) | |
| download | cmake-5d1fe90ed12f16f1af033b01318062a836d1f4e2.tar.gz | |
Merge branch 'emacs-mode-underscore-in-symbol' into release
| -rw-r--r-- | Auxiliary/cmake-mode.el | 3 | ||||
| -rw-r--r-- | Help/release/3.1.0.rst | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/Auxiliary/cmake-mode.el b/Auxiliary/cmake-mode.el index c8b9f8bb8d..f1470f3f56 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) diff --git a/Help/release/3.1.0.rst b/Help/release/3.1.0.rst index e7a695db92..65aae000b0 100644 --- a/Help/release/3.1.0.rst +++ b/Help/release/3.1.0.rst @@ -386,3 +386,7 @@ Other Changes the Open Watcom external version numbering. The external version numbers are lower than the internal version number by 11. + +* The ``cmake-mode.el`` major Emacs editing mode no longer + treats ``_`` as part of words, making it more consistent + with other major modes. |