summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-08-17 14:25:00 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2015-08-17 14:25:00 (GMT)
commit581379cadf87c78af48c57a61b0abd89f4c99d92 (patch)
tree0b547de9aed2a0c8e4ff3f5532a15a1078cacd98
parentf4885a94ed20daca102bdca8acebd10084a034b2 (diff)
parent64e6bc5ca3bf15239829f18a71511df2f04181b3 (diff)
downloadCMake-581379cadf87c78af48c57a61b0abd89f4c99d92.zip
CMake-581379cadf87c78af48c57a61b0abd89f4c99d92.tar.gz
CMake-581379cadf87c78af48c57a61b0abd89f4c99d92.tar.bz2
Merge topic 'emacs-mode-font-lock'
64e6bc5c cmake-mode.el: Refine variable font-lock 758664b7 cmake-mode.el: Fix function name font-lock
-rw-r--r--Auxiliary/cmake-mode.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/Auxiliary/cmake-mode.el b/Auxiliary/cmake-mode.el
index 02f0385..11e33b3 100644
--- a/Auxiliary/cmake-mode.el
+++ b/Auxiliary/cmake-mode.el
@@ -198,9 +198,9 @@ 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]+\\|[$*_]\\)"
+ (,(rx "${" (group (+(any alnum "-_+/."))) "}")
1 font-lock-variable-name-face t)
)
"Highlighting expressions for CMake mode.")