Skip to content

Commit 3741ee3

Browse files
slipsetbbatsov
authored andcommitted
[Fix #459] Add font-locking for new vars in added in Clojure 1.9 (#460)
1 parent 061431d commit 3741ee3

File tree

2 files changed

+20
-15
lines changed

2 files changed

+20
-15
lines changed

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
* New interactive command `clojure-cycle-when`.
2121
* New interactive command `clojure-cycle-not`.
2222
* New defcustom `clojure-comment-regexp` for font-locking `#_` or `#_` AND `(comment)` sexps.
23+
* [#459](https://github.com/clojure-emacs/clojure-mode/issues/459): Add font lock for new vars in clojure-1.9
2324

2425
## 5.6.1 (2016-12-21)
2526

clojure-mode-extra-font-locking.el

+19-15
Original file line numberDiff line numberDiff line change
@@ -40,16 +40,16 @@
4040
"accessor" "aclone"
4141
"agent" "agent-errors" "aget" "alength" "alias"
4242
"all-ns" "alter" "alter-meta!" "alter-var-root" "amap"
43-
"ancestors" "apply" "areduce" "array-map" "as->"
43+
"ancestors" "any?" "apply" "areduce" "array-map" "as->"
4444
"aset" "aset-boolean" "aset-byte" "aset-char" "aset-double"
4545
"aset-float" "aset-int" "aset-long" "aset-short" "assert"
4646
"assoc" "assoc!" "assoc-in" "associative?" "atom"
4747
"await" "await-for" "await1" "bases" "bean"
4848
"bigdec" "bigint" "bit-and" "bit-and-not"
4949
"bit-clear" "bit-flip" "bit-not" "bit-or" "bit-set"
50-
"bit-shift-left" "bit-shift-right" "bit-test" "bit-xor" "boolean"
51-
"boolean-array" "booleans" "bound-fn" "bound-fn*" "bound?" "butlast"
52-
"byte" "byte-array" "bytes" "cast" "char"
50+
"bit-shift-left" "bit-shift-right" "bit-test" "bit-xor" "boolean" "boolean?"
51+
"boolean-array" "booleans" "bounded-count" "bound-fn" "bound-fn*"
52+
"bound?" "butlast" "byte" "byte-array" "bytes" "bytes?" "cast" "char"
5353
"char-array" "char-escape-string" "char-name-string" "char?" "chars"
5454
"chunk" "chunk-append" "chunk-buffer" "chunk-cons" "chunk-first"
5555
"chunk-next" "chunk-rest" "chunked-seq?" "class" "class?"
@@ -62,7 +62,7 @@
6262
"derive" "descendants" "destructure" "disj" "disj!"
6363
"dissoc" "dissoc!" "distinct" "distinct?"
6464
"doc"
65-
"double" "double-array" "doubles" "drop"
65+
"double" "double?" "double-array" "doubles" "drop"
6666
"drop-last" "drop-while" "empty" "empty?" "ensure"
6767
"enumeration-seq" "error-handler" "error-mode" "eval" "even?" "every?"
6868
"every-pred" "extend" "extend-protocol" "extend-type" "extends?"
@@ -74,9 +74,9 @@
7474
"future-call" "future-cancel" "future-cancelled?" "future-done?" "future?"
7575
"gen-interface" "gensym" "get" "get-in"
7676
"get-method" "get-proxy-class" "get-thread-bindings" "get-validator"
77-
"group-by" "hash" "hash-map" "hash-ordered-coll" "hash-set"
78-
"hash-unordered-coll" "identical?" "identity" "ifn?" "inc"
79-
"init-proxy" "instance?" "int" "int-array" "integer?"
77+
"group-by" "halt-when?" "hash" "hash-map" "hash-ordered-coll" "hash-set"
78+
"hash-unordered-coll" "ident?" "identical?" "identity" "indexed?" "ifn?" "inc"
79+
"init-proxy" "instance?" "inst-ms" "inst?" "int" "int?" "int-array" "integer?"
8080
"interleave" "intern" "interpose" "into" "into-array"
8181
"ints" "io!" "isa?" "iterate" "iterator-seq"
8282
"juxt" "keep" "keep-indexed" "key" "keys" "keyword" "keyword?"
@@ -88,20 +88,22 @@
8888
"map-indexed" "mapcat" "max" "max-key" "memfn" "memoize"
8989
"merge" "merge-with" "meta" "method-sig" "methods"
9090
"min" "min-key" "mix-collection-hash" "mod" "name" "namespace"
91+
"nat-int?" "neg-int?"
9192
"neg?" "newline" "next" "nfirst" "nil?"
9293
"nnext" "not" "not-any?" "not-empty" "not-every?"
9394
"not=" "ns-aliases" "ns-imports" "ns-interns"
9495
"ns-map" "ns-name" "ns-publics" "ns-refers" "ns-resolve"
9596
"ns-unalias" "ns-unmap" "nth" "nthnext" "nthrest" "num"
9697
"number?" "numerator" "object-array" "odd?" "parents" "partial"
9798
"partition" "partition-all" "partition-by" "pcalls" "peek" "persistent!"
98-
"pmap" "pop" "pop!" "pop-thread-bindings" "pos?" "pr"
99+
"pmap" "pop" "pop!" "pop-thread-bindings" "pos?" "pos-int?" "pr"
99100
"pr-str" "prefer-method" "prefers" "primitives-classnames" "print"
100101
"print-ctor" "print-doc" "print-dup" "print-method" "print-namespace-doc"
101102
"print-simple" "print-special-doc" "print-str" "printf" "println"
102103
"println-str" "prn" "prn-str" "promise" "proxy"
103104
"proxy-call-with-super" "proxy-mappings" "proxy-name" "proxy-super"
104-
"push-thread-bindings" "pvalues" "quot" "rand" "rand-int" "rand-nth" "range"
105+
"push-thread-bindings" "pvalues" "qualified-ident?" "qualified-keyword?"
106+
"qualified-symbol?" "quot" "rand" "rand-int" "rand-nth" "range"
105107
"ratio?" "rational?" "rationalize" "re-find" "re-groups"
106108
"re-matcher" "re-matches" "re-pattern" "re-seq" "read"
107109
"read-line" "read-string" "realized?" "record?" "reduce" "reduce-kv"
@@ -110,19 +112,20 @@
110112
"release-pending-sends" "rem" "remove" "remove-all-methods"
111113
"remove-method" "remove-ns" "remove-watch"
112114
"repeat" "repeatedly" "replace" "replicate"
113-
"require" "restart-agent" "reset!" "reset-meta!" "resolve" "rest"
115+
"require" "restart-agent" "reset!" "reset-meta!" "reset-vals!" "resolve" "rest"
114116
"resultset-seq" "reverse" "reversible?" "rseq" "rsubseq"
115117
"satisfies?" "second" "select-keys" "send" "send-off" "send-via" "seq"
116-
"seq?" "seque" "sequence" "sequential?" "set"
118+
"seq?" "seqable?" "seque" "sequence" "sequential?" "set"
117119
"set-agent-send-executor!" "set-agent-send-off-executor!"
118120
"set-error-handler!" "set-error-mode!" "set-validator!" "set?" "short"
119121
"short-array" "shorts" "shuffle"
120-
"shutdown-agents" "slurp" "some" "some->" "some->>" "some-fn" "some?"
122+
"shutdown-agents" "simple-indent?" "simple-keyword?" "simple-symbol?"
123+
"slurp" "some" "some->" "some->>" "some-fn" "some?"
121124
"sort" "sort-by" "sorted-map" "sorted-map-by" "sorted-set" "sorted-set-by"
122125
"sorted?" "special-form-anchor" "special-symbol?" "specify" "specify!"
123126
"spit" "split-at" "split-with" "str"
124127
"stream?" "string?" "struct" "struct-map" "subs"
125-
"subseq" "subvec" "supers" "swap!" "symbol"
128+
"subseq" "subvec" "supers" "swap!" "swap-vals!" "symbol"
126129
"symbol?" "sync" "syntax-symbol-anchor" "take" "take-last"
127130
"take-nth" "take-while" "test" "the-ns" "thread-bound?" "time"
128131
"to-array" "to-array-2d" "trampoline" "transient" "tree-seq"
@@ -134,7 +137,8 @@
134137
"unchecked-remainder" "unchecked-remainder-int" "unchecked-short"
135138
"unchecked-subtract-int" "unchecked-subtract"
136139
"underive" "unsigned-bit-shift-right" "unquote" "unquote-splicing"
137-
"update" "update-in" "update-proxy" "use" "val" "vals" "var-get" "var-set"
140+
"update" "update-in" "update-proxy" "uri?" "use" "uuid?" "val" "vals"
141+
"var-get" "var-set"
138142
"var?" "vary-meta" "vec" "vector" "vector?" "vector-of" "while"
139143
"with-bindings" "with-bindings*" "with-in-str" "with-loading-context"
140144
"with-meta" "with-out-str" "with-precision"

0 commit comments

Comments
 (0)