diff options
| author | Rostislav Svoboda <thebost@gmail.com> | 2018-03-17 15:33:44 +0100 |
|---|---|---|
| committer | Bozhidar Batsov <bozhidar.batsov@gmail.com> | 2018-03-27 19:23:13 +0700 |
| commit | 6ed4a6cb14f93a514993abe8df28bff09cfc356c (patch) | |
| tree | 0d8a848f0aa7a7b5a7d03b0311d78b97692e2861 /clojure-mode.el | |
| parent | d1e0a6e99f8a98cc2976a23e856efa6d25283f23 (diff) | |
Fix font-locking of namespaced keywords
See #474
Diffstat (limited to 'clojure-mode.el')
| -rw-r--r-- | clojure-mode.el | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/clojure-mode.el b/clojure-mode.el index 073e287..accfe3c 100644 --- a/clojure-mode.el +++ b/clojure-mode.el @@ -854,18 +854,19 @@ any number of matches of `clojure--sym-forbidden-rest-chars'.")) ;; TODO dedupe the code for matching of keywords, type-hints and unmatched symbols - ;; keywords: {:oneword/veryCom|pLex.stu-ff 0} - (,(concat "\\(:\\)\\(" clojure--sym-regexp "\\)\\(/\\)\\(" clojure--sym-regexp "\\)") + ;; keywords: {:oneword/ve/yCom|pLex.stu-ff 0} + (,(concat "\\(:\\{1,2\\}\\)\\(" clojure--sym-regexp "?\\)\\(/\\)\\(" clojure--sym-regexp "\\)") (1 'clojure-keyword-face) (2 font-lock-type-face) + ;; (2 'clojure-keyword-face) (3 'default) (4 'clojure-keyword-face)) - (,(concat "\\(:\\)\\(" clojure--sym-regexp "\\)") + (,(concat "\\(:\\{1,2\\}\\)\\(" clojure--sym-regexp "\\)") (1 'clojure-keyword-face) (2 'clojure-keyword-face)) ;; type-hints: #^oneword - (,(concat "\\(#^\\)\\(" clojure--sym-regexp "\\)\\(/\\)\\(" clojure--sym-regexp "\\)") + (,(concat "\\(#^\\)\\(" clojure--sym-regexp "?\\)\\(/\\)\\(" clojure--sym-regexp "\\)") (1 'default) (2 font-lock-type-face) (3 'default) @@ -875,7 +876,7 @@ any number of matches of `clojure--sym-forbidden-rest-chars'.")) (2 font-lock-type-face)) ;; clojure symbols not matched by the previous regexps - (,(concat "\\(" clojure--sym-regexp "\\)\\(/\\)\\(" clojure--sym-regexp "\\)") + (,(concat "\\(" clojure--sym-regexp "?\\)\\(/\\)\\(" clojure--sym-regexp "\\)") (1 font-lock-type-face) (2 'default) (3 'default)) |