Commit 5d1fe90e authored by Brad King's avatar Brad King
Browse files

Merge branch 'emacs-mode-underscore-in-symbol' into release

parents 5bed08a0 cb80e513
...@@ -202,7 +202,7 @@ the indentation. Otherwise it retains the same position on the line" ...@@ -202,7 +202,7 @@ the indentation. Otherwise it retains the same position on the line"
;; Keyword highlighting regex-to-face map. ;; Keyword highlighting regex-to-face map.
;; ;;
(defconst cmake-font-lock-keywords (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." "Highlighting expressions for CMAKE mode."
) )
...@@ -241,7 +241,6 @@ the indentation. Otherwise it retains the same position on the line" ...@@ -241,7 +241,6 @@ the indentation. Otherwise it retains the same position on the line"
; Create the syntax table ; Create the syntax table
(setq cmake-mode-syntax-table (make-syntax-table)) (setq cmake-mode-syntax-table (make-syntax-table))
(set-syntax-table cmake-mode-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) (modify-syntax-entry ?\) ")(" cmake-mode-syntax-table)
(modify-syntax-entry ?# "<" cmake-mode-syntax-table) (modify-syntax-entry ?# "<" cmake-mode-syntax-table)
......
...@@ -386,3 +386,7 @@ Other Changes ...@@ -386,3 +386,7 @@ Other Changes
the Open Watcom external version numbering. The external the Open Watcom external version numbering. The external
version numbers are lower than the internal version number version numbers are lower than the internal version number
by 11. 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.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment