Remove doall and dorun from clojureRepeat and lispwords

guns · guns · commit 5ccae650bf0c · 2014-03-26T01:59:24.000-05:00
Removal from clojureRepeat:

    - These are not looping macros like doseq, dotimes, and while

Removal from lispwords:

    - These functions are not macros with binding forms
    - More in common with `take` than `doseq`
diff --git a/clj/src/vim_clojure_static/generate.clj b/clj/src/vim_clojure_static/generate.clj
@@ -109,7 +109,7 @@
                              if-some when when-first when-let when-not
                              when-some}]
                   ;; Imperative looping constructs (not sequence functions)
-                  ["Repeat" '#{doall dorun doseq dotimes while}]]
+                  ["Repeat" '#{doseq dotimes while}]]
         coresyms (set/difference (set (keys (ns-publics 'clojure.core)))
                                  (set (mapcat peek builtins)))
         group-preds [["Define" #(re-seq #"\Adef(?!ault)" (str %))]
@@ -162,10 +162,10 @@
        defn- defonce defprotocol defrecord defstruct deftest deftest- deftype
        extend extend-protocol extend-type fn ns proxy reify set-test}
     ;; Binding forms
-    '#{as-> binding doall dorun doseq dotimes doto for if-let if-some let
-       letfn locking loop testing when-first when-let when-some with-bindings
-       with-in-str with-local-vars with-open with-precision with-redefs
-       with-redefs-fn with-test}
+    '#{as-> binding doseq dotimes doto for if-let if-some let letfn locking
+       loop testing when-first when-let when-some with-bindings with-in-str
+       with-local-vars with-open with-precision with-redefs with-redefs-fn
+       with-test}
     ;; Conditional branching
     '#{case cond-> cond->> condp if if-not when when-not while}
     ;; Exception handling
diff --git a/ftplugin/clojure.vim b/ftplugin/clojure.vim
@@ -44,7 +44,7 @@ setlocal commentstring=;\ %s
 "
 " -*- LISPWORDS -*-
 " Generated from https://github.com/guns/vim-clojure-static/blob/%%RELEASE_TAG%%/clj/src/vim_clojure_static/generate.clj
-setlocal lispwords=as->,binding,bound-fn,case,catch,cond->,cond->>,condp,def,definline,definterface,defmacro,defmethod,defmulti,defn,defn-,defonce,defprotocol,defrecord,defstruct,deftest,deftest-,deftype,doall,dorun,doseq,dotimes,doto,extend,extend-protocol,extend-type,fn,for,if,if-let,if-not,if-some,let,letfn,locking,loop,ns,proxy,reify,set-test,testing,when,when-first,when-let,when-not,when-some,while,with-bindings,with-in-str,with-local-vars,with-open,with-precision,with-redefs,with-redefs-fn,with-test
+setlocal lispwords=as->,binding,bound-fn,case,catch,cond->,cond->>,condp,def,definline,definterface,defmacro,defmethod,defmulti,defn,defn-,defonce,defprotocol,defrecord,defstruct,deftest,deftest-,deftype,doseq,dotimes,doto,extend,extend-protocol,extend-type,fn,for,if,if-let,if-not,if-some,let,letfn,locking,loop,ns,proxy,reify,set-test,testing,when,when-first,when-let,when-not,when-some,while,with-bindings,with-in-str,with-local-vars,with-open,with-precision,with-redefs,with-redefs-fn,with-test
 
 " Provide insert mode completions for special forms and clojure.core. As
 " 'omnifunc' is set by popular Clojure REPL client plugins, we also set
diff --git a/syntax/clojure.vim b/syntax/clojure.vim

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ setlocal commentstring=;\ %s`
`44`	`44`	`"`
`45`	`45`	`" -- LISPWORDS --`
`46`	`46`	`" Generated from https://github.com/guns/vim-clojure-static/blob/%%RELEASE_TAG%%/clj/src/vim_clojure_static/generate.clj`
`47`		-setlocal lispwords=as->,binding,bound-fn,case,catch,cond->,cond->>,condp,def,definline,definterface,defmacro,defmethod,defmulti,defn,defn-,defonce,defprotocol,defrecord,defstruct,deftest,deftest-,deftype,doall,dorun,doseq,dotimes,doto,extend,extend-protocol,extend-type,fn,for,if,if-let,if-not,if-some,let,letfn,locking,loop,ns,proxy,reify,set-test,testing,when,when-first,when-let,when-not,when-some,while,with-bindings,with-in-str,with-local-vars,with-open,with-precision,with-redefs,with-redefs-fn,with-test
	`47`	`+setlocal lispwords=as->,binding,bound-fn,case,catch,cond->,cond->>,condp,def,definline,definterface,defmacro,defmethod,defmulti,defn,defn-,defonce,defprotocol,defrecord,defstruct,deftest,deftest-,deftype,doseq,dotimes,doto,extend,extend-protocol,extend-type,fn,for,if,if-let,if-not,if-some,let,letfn,locking,loop,ns,proxy,reify,set-test,testing,when,when-first,when-let,when-not,when-some,while,with-bindings,with-in-str,with-local-vars,with-open,with-precision,with-redefs,with-redefs-fn,with-test`
`48`	`48`
`49`	`49`	`" Provide insert mode completions for special forms and clojure.core. As`
`50`	`50`	`" 'omnifunc' is set by popular Clojure REPL client plugins, we also set`