Skip to content

Commit b1b0670

Browse files
committed
Merge pull request #268 from m00nlight/add-missing-functions
Add some missing functions for font lock
2 parents 4b6d876 + 6017a9c commit b1b0670

File tree

2 files changed

+49
-38
lines changed

2 files changed

+49
-38
lines changed

clojure-mode-extra-font-locking.el

Lines changed: 49 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -58,23 +58,24 @@
5858
"complement" "concat" "conj"
5959
"conj!" "cons" "constantly" "construct-proxy" "contains?"
6060
"count" "counted?" "create-ns" "create-struct" "cycle"
61-
"dec" "decimal?" "delay" "delay?" "deliver" "deref"
61+
"dec" "decimal?" "delay" "delay?" "deliver" "denominator" "deref"
6262
"derive" "descendants" "destructure" "disj" "disj!"
6363
"dissoc" "dissoc!" "distinct" "distinct?"
6464
"doc"
6565
"double" "double-array" "doubles" "drop"
66-
"drop-last" "drop-while" "empty" "empty?" "ensure"
67-
"enumeration-seq" "eval" "even?" "every?"
68-
"extend" "extend-protocol" "extend-type" "extends?" "extenders" "ex-info" "ex-data"
66+
"drop-last" "drop-while" "empty" "empty?" "ensure"
67+
"enumeration-seq" "error-handler" "error-mode" "eval" "even?" "every?"
68+
"every-pred" "extend" "extend-protocol" "extend-type" "extends?"
69+
"extenders" "ex-info" "ex-data"
6970
"false?" "ffirst" "file-seq" "filter" "filterv" "find" "find-doc"
70-
"find-ns" "find-var" "first" "flatten" "float" "float-array"
71+
"find-ns" "find-keyword" "find-var" "first" "flatten" "float" "float-array"
7172
"float?" "floats" "flush" "fn?"
7273
"fnext" "force" "format" "frequencies" "future"
7374
"future-call" "future-cancel" "future-cancelled?" "future-done?" "future?"
7475
"gen-interface" "gensym" "get" "get-in"
75-
"get-method" "get-proxy-class" "get-thread-bindings" "get-validator" "group-by"
76-
"hash" "hash-map" "hash-set" "identical?" "identity"
77-
"ifn?" "inc"
76+
"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"
7879
"init-proxy" "instance?" "int" "int-array" "integer?"
7980
"interleave" "intern" "interpose" "into" "into-array"
8081
"ints" "io!" "isa?" "iterate" "iterator-seq"
@@ -91,42 +92,50 @@
9192
"nnext" "not" "not-any?" "not-empty" "not-every?"
9293
"not=" "ns-aliases" "ns-imports" "ns-interns"
9394
"ns-map" "ns-name" "ns-publics" "ns-refers" "ns-resolve"
94-
"ns-unalias" "ns-unmap" "nth" "nthnext" "num"
95-
"number?" "odd?" "parents" "partial"
96-
"partition" "partition-all" "partition-by" "pcalls" "peek" "persistent!" "pmap"
97-
"pop" "pop!" "pop-thread-bindings" "pos?" "pr"
95+
"ns-unalias" "ns-unmap" "nth" "nthnext" "nthrest" "num"
96+
"number?" "numerator" "object-array" "odd?" "parents" "partial"
97+
"partition" "partition-all" "partition-by" "pcalls" "peek" "persistent!"
98+
"pmap" "pop" "pop!" "pop-thread-bindings" "pos?" "pr"
9899
"pr-str" "prefer-method" "prefers" "primitives-classnames" "print"
99100
"print-ctor" "print-doc" "print-dup" "print-method" "print-namespace-doc"
100101
"print-simple" "print-special-doc" "print-str" "printf" "println"
101102
"println-str" "prn" "prn-str" "promise" "proxy"
102-
"proxy-call-with-super" "proxy-mappings" "proxy-name" "proxy-super" "push-thread-bindings"
103-
"pvalues" "quot" "rand" "rand-int" "range"
103+
"proxy-call-with-super" "proxy-mappings" "proxy-name" "proxy-super"
104+
"push-thread-bindings" "pvalues" "quot" "rand" "rand-int" "rand-nth" "range"
104105
"ratio?" "rational?" "rationalize" "re-find" "re-groups"
105106
"re-matcher" "re-matches" "re-pattern" "re-seq" "read"
106-
"read-line" "read-string" "reify" "reduce" "reduce-kv" "ref" "ref-history-count"
107+
"read-line" "read-string" "realized?" "record?" "reduce" "reduce-kv"
108+
"reduced" "reduced?" "reductions" "reify" "ref" "ref-history-count"
107109
"ref-max-history" "ref-min-history" "ref-set" "refer-clojure"
108-
"release-pending-sends" "rem" "remove" "remove-method" "remove-ns"
110+
"release-pending-sends" "rem" "remove" "remove-all-methods"
111+
"remove-method" "remove-ns" "remove-watch"
109112
"repeat" "repeatedly" "replace" "replicate"
110-
"require" "reset!" "reset-meta!" "resolve" "rest"
113+
"require" "restart-agent" "reset!" "reset-meta!" "resolve" "rest"
111114
"resultset-seq" "reverse" "reversible?" "rseq" "rsubseq"
112115
"satisfies?" "second" "select-keys" "send" "send-off" "send-via" "seq"
113116
"seq?" "seque" "sequence" "sequential?" "set"
114117
"set-agent-send-executor!" "set-agent-send-off-executor!"
115-
"set-validator!" "set?" "short" "short-array" "shorts"
116-
"shutdown-agents" "slurp" "some" "some->" "some->>" "some?" "sort" "sort-by"
117-
"sorted-map" "sorted-map-by" "sorted-set" "sorted-set-by" "sorted?"
118-
"special-form-anchor" "special-symbol?" "specify" "specify!" "spit" "split-at" "split-with" "str"
118+
"set-error-handler!" "set-error-mode!" "set-validator!" "set?" "short"
119+
"short-array" "shorts" "shuffle"
120+
"shutdown-agents" "slurp" "some" "some->" "some->>" "some-fn" "some?"
121+
"sort" "sort-by" "sorted-map" "sorted-map-by" "sorted-set" "sorted-set-by"
122+
"sorted?" "special-form-anchor" "special-symbol?" "specify" "specify!"
123+
"spit" "split-at" "split-with" "str"
119124
"stream?" "string?" "struct" "struct-map" "subs"
120125
"subseq" "subvec" "supers" "swap!" "symbol"
121126
"symbol?" "sync" "syntax-symbol-anchor" "take" "take-last"
122-
"take-nth" "take-while" "test" "the-ns" "time"
127+
"take-nth" "take-while" "test" "the-ns" "thread-bound?" "time"
123128
"to-array" "to-array-2d" "trampoline" "transient" "tree-seq"
124-
"true?" "type" "unchecked-add" "unchecked-dec" "unchecked-divide"
125-
"unchecked-inc" "unchecked-multiply" "unchecked-negate" "unchecked-remainder" "unchecked-subtract"
126-
"underive" "unsigned-bit-shift-right" "unquote" "unquote-splicing" "update-in" "update-proxy"
127-
"use" "val" "vals" "var-get" "var-set"
128-
"var?" "vary-meta" "vec" "vector" "vector?"
129-
"while"
129+
"true?" "type" "unchecked-add" "unchecked-add-int" "unchecked-byte"
130+
"unchecked-char" "unchecked-dec" "unchecked-dec-int" "unchecked-divide"
131+
"unchecked-divide-int" "unchecked-double" "unchecked-float"
132+
"unchecked-inc" "unchecked-inc-int" "unchecked-long" "unchecked-multiply"
133+
"unchecked-multiply-int" "unchecked-negate" "unchecked-negate-int"
134+
"unchecked-remainder" "unchecked-remainder-int" "unchecked-short"
135+
"unchecked-subtract-int" "unchecked-subtract"
136+
"underive" "unsigned-bit-shift-right" "unquote" "unquote-splicing"
137+
"update-in" "update-proxy" "use" "val" "vals" "var-get" "var-set"
138+
"var?" "vary-meta" "vec" "vector" "vector?" "vector-of" "while"
130139
"with-bindings" "with-bindings*" "with-in-str" "with-loading-context"
131140
"with-meta" "with-out-str" "with-precision"
132141
"with-redefs" "with-redefs-fn" "xml-seq" "zero?" "zipmap"
@@ -140,19 +149,22 @@
140149
"difference" "index" "intersection" "join" "map-invert"
141150
"project" "rename" "rename-keys" "select" "union"
142151
;; clojure.stacktrace
143-
"e" "print-cause-trace" "print-stack-trace" "print-throwable" "print-trace-element"
152+
"e" "print-cause-trace" "print-stack-trace" "print-throwable"
153+
"print-trace-element"
144154
;; clojure.template
145155
"do-template" "apply-template"
146156
;; clojure.test
147157
"are" "assert-any" "assert-expr"
148158
"assert-predicate" "compose-fixtures" "deftest" "deftest-" "file-position"
149-
"function?" "get-possibly-unbound-var" "inc-report-counter" "is" "join-fixtures"
150-
"report" "run-all-tests" "run-tests" "set-test" "successful?"
151-
"test-all-vars" "test-ns" "test-var" "test-vars" "testing" "testing-contexts-str"
152-
"testing-vars-str" "try-expr" "use-fixtures" "with-test" "with-test-out"
159+
"function?" "get-possibly-unbound-var" "inc-report-counter" "is"
160+
"join-fixtures" "report" "run-all-tests" "run-tests" "set-test"
161+
"successful?" "test-all-vars" "test-ns" "test-var" "test-vars" "testing"
162+
"testing-contexts-str" "testing-vars-str" "try-expr" "use-fixtures"
163+
"with-test" "with-test-out"
153164
;; clojure.walk
154-
"keywordize-keys" "macroexpand-all" "postwalk" "postwalk-demo" "postwalk-replace"
155-
"prewalk" "prewalk-demo" "prewalk-replace" "stringify-keys" "walk"
165+
"keywordize-keys" "macroexpand-all" "postwalk" "postwalk-demo"
166+
"postwalk-replace" "prewalk" "prewalk-demo" "prewalk-replace"
167+
"stringify-keys" "walk"
156168
;; clojure.xml
157169
"attrs"
158170
"content" "content-handler" "element" "emit" "emit-element"
@@ -166,8 +178,8 @@
166178

167179
(defvar clojure-built-in-dynamic-vars
168180
'(;; clojure.test
169-
"*initial-report-counters*" "*load-tests*" "*report-counters*" "*stack-trace-depth*" "*test-out*"
170-
"*testing-contexts*" "*testing-vars*"
181+
"*initial-report-counters*" "*load-tests*" "*report-counters*"
182+
"*stack-trace-depth*" "*test-out*" "*testing-contexts*" "*testing-vars*"
171183
;; clojure.xml
172184
"*current*" "*sb*" "*stack*" "*state*"
173185
))

clojure-mode.el

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -616,7 +616,6 @@ point) to check."
616616
(put 'definline 'clojure-doc-string-elt 2)
617617
(put 'defprotocol 'clojure-doc-string-elt 2)
618618

619-
620619

621620
(defun clojure-indent-line ()
622621
"Indent current line as Clojure code."

0 commit comments

Comments
 (0)