Bake in g:clojure_highlight_clojure_core = 1

The extra time needed to add vars from clojure.core is about 2-10ms.

Author: guns

autoload/vim_clojure_highlight.clj

@@ -60,11 +60,6 @@
   [var]
   (= "clojure.core" (-> var meta :ns str)))
 
-(defn refers [ns include-clojure-core?]
-  (if include-clojure-core?
-    (ns-refers ns)
-    (remove (comp clojure-core? peek) (ns-refers ns))))
-
 (defn aliased-refers [ns]
   (mapcat
     (fn [[alias alias-ns]]
@@ -87,15 +82,11 @@
                     (mapv (comp pr-str str first))
                     (string/join \,)
                     (format "'%s': [%s]" type))))
-       (string/join \,)
-       (format "let b:clojure_syntax_keywords = { %s }")))
+       (string/join \,)))
 
 (defn ns-syntax-command [ns & opts]
-  (let [{:keys [local-vars clojure-core]
-         :or {local-vars true clojure-core true}} (apply hash-map opts)
-        refs (refers ns clojure-core)
-        dict (syntax-keyword-dictionary (concat refs
+  (let [{:keys [local-vars] :or {local-vars true}} (apply hash-map opts)
+        dict (syntax-keyword-dictionary (concat (ns-refers ns)
                                                 (aliased-refers ns)
                                                 (when local-vars (ns-publics ns))))]
-    (str "let b:clojure_syntax_without_core_keywords = " (if clojure-core 1 0)
-         " | " dict)))
+    (str "let b:clojure_syntax_without_core_keywords = 1 | let b:clojure_syntax_keywords = {" dict "}")))

autoload/vim_clojure_highlight.vim

@@ -18,12 +18,13 @@ function! vim_clojure_highlight#syntax_match_references(...)
 	try
 		call s:require()
 
-		let ns    = "'" . fireplace#ns()
-		let opts  = (a:0 > 0 && !a:1) ? ' :local-vars false' : ''
-		let opts .= (a:0 > 1 && !a:2) ? ' :clojure-core false' : ''
+		let ns = "'" . fireplace#ns()
+		let opts = (a:0 > 0 && !a:1) ? ' :local-vars false' : ''
 
 		execute fireplace#evalparse("(vim-clojure-highlight/ns-syntax-command " . ns . opts . ")")
 		let &syntax = &syntax
 	catch /./
 	endtry
 endfunction
+
+" vim:noet:sw=8:ts=8

plugin/vim_clojure_highlight.vim

@@ -8,13 +8,9 @@ if !exists('g:clojure_highlight_local_vars')
 	let g:clojure_highlight_local_vars = 1
 endif
 
-if !exists('g:clojure_highlight_clojure_core')
-	let g:clojure_highlight_clojure_core = 1
-endif
-
 function! s:syntax_match_references()
 	if g:clojure_highlight_references
-		call vim_clojure_highlight#syntax_match_references(g:clojure_highlight_local_vars, g:clojure_highlight_clojure_core)
+		call vim_clojure_highlight#syntax_match_references(g:clojure_highlight_local_vars)
 	endif
 endfunction