# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1520992860 14400
# Node ID 249f8983c3d5a7edb19e643b73f435ba7264743b
# Parent  5170da4ec03ac0f933b5877d5accb8d36f771c56# Parent  b6d64b1c4cdf53060e3c30b3b87a653a30dc85d0
Merge.

diff -r b6d64b1c4cdf -r 249f8983c3d5 .hgsubstate
--- a/.hgsubstate	Tue Mar 13 16:40:00 2018 +0000
+++ b/.hgsubstate	Tue Mar 13 22:01:00 2018 -0400
@@ -4,12 +4,12 @@
 a16a9b63eb85cc0960a7f25c54647ac1f99f3360 vim/bundle/ack
 5e4a535e2d239cba3db19b6b79abedbc7c541727 vim/bundle/badwolf
 a4d79fc208764917cb58e2aed6fbaeb5e3356d33 vim/bundle/clam
-f1c53e290b16885c2eb3fc96e57d9984b627f735 vim/bundle/clojure-static
+fae5710a0b79555fe3296145be4f85148266771a vim/bundle/clojure-static
 be79030b3e8c0ee3c5f45b4333919e4830531e80 vim/bundle/commentary
 c6d1fc5e58d689bfb104ff336aeb89d9ef1b48e2 vim/bundle/ctrlp
 38487bbec8ba50834e257940b357de03991fa8f9 vim/bundle/delimitmate
 6dd4480388e4727dfe5c723484c500e03b429c28 vim/bundle/dispatch
-1c75b56ceb96a6e7fb6708ae96ab63b3023bab2f vim/bundle/fireplace
+ea86de69992d487960e9b70e97bfd584ab8ab449 vim/bundle/fireplace
 8f60d1d459362771cb68c0097565efdf52e62ec3 vim/bundle/fugitive
 127d706f2def96876605e6bd5d366c973cb8e406 vim/bundle/gdl
 6ea4e1983b18cf440c8f800a3e94b57338a3e99f vim/bundle/glsl
diff -r b6d64b1c4cdf -r 249f8983c3d5 lispwords
--- a/lispwords	Tue Mar 13 16:40:00 2018 +0000
+++ b/lispwords	Tue Mar 13 22:01:00 2018 -0400
@@ -22,6 +22,7 @@
 (1 make-instance)
 (1 dis)
 (1 do-array)
+(1 doseq)
 
 ; fiveam
 (1 test)
diff -r b6d64b1c4cdf -r 249f8983c3d5 vim/vimrc
--- a/vim/vimrc	Tue Mar 13 16:40:00 2018 +0000
+++ b/vim/vimrc	Tue Mar 13 22:01:00 2018 -0400
@@ -884,31 +884,6 @@
 " extra folding {{{
 let g:clojure_fold_extra = [ 
             \ 'defgauge',
-            \ 'defmeter',
-            \ 'defhistogram',
-            \ 'defcounter',
-            \ 'deftimer',
-            \
-            \ 'defdb',
-            \ 'defentity',
-            \ 'defaspect',
-            \ 'add-aspect',
-            \ 'defmigration',
-            \
-            \ 'defsynth',
-            \ 'definst',
-            \ 'defproject',
-            \
-            \ 'defroutes',
-            \
-            \ 'defrec',
-            \
-            \ 'defparser',
-            \
-            \ 'defform',
-            \ 'defform-',
-            \
-            \ 'defpage',
             \ 'defsketch'
             \
             \ ]
@@ -918,11 +893,9 @@
     au!
 
     au BufNewFile,BufRead *.edn set filetype=clojure
-    au BufNewFile,BufRead riemann.config set filetype=clojure
 
     au FileType clojure silent! call TurnOnClojureFolding()
     au FileType clojure compiler clojure
-    au FileType clojure setlocal report=100000
     au FileType clojure setlocal isk-=.
 
     au FileType clojure iabbrev <buffer> defun defn
@@ -932,28 +905,18 @@
 
     au FileType clojure RainbowParenthesesActivate
     au syntax clojure RainbowParenthesesLoadRound
-    au syntax clojure RainbowParenthesesLoadSquare
-    au syntax clojure RainbowParenthesesLoadBraces
-
-    " Since YCM is hosefucked for Clojure, we'll use completefunc on <c-n>
-    au FileType clojure inoremap <c-n> <c-x><c-u>
-
-    " And close the omnicomplete preview window after we're done with it.
-    au InsertLeave *.clj if pumvisible() == 0|pclose|endif
 
     " Paredit
     au FileType clojure call EnableParedit()
-
-    " Navigate trees of sexps with arrows
-    au FileType clojure call s:vim_sexp_mappings()
-    au FileType clojure noremap <buffer> <left> :<c-u>call SexpBack()<cr>
-    au FileType clojure noremap <buffer> <right> :<c-u>call SexpForward()<cr>
-    au FileType clojure noremap <buffer> <up> :<c-u>call SexpUp()<cr>
-    au FileType clojure noremap <buffer> <down> :<c-u>call SexpDown()<cr>
+    au FileType clojure nnoremap <buffer> <localleader>( :call PareditToggle()<cr>
+    " )
+
+    " Duplicate
+    au FileType clojure nnoremap <buffer> [] :call DuplicateLispForm()<cr>
 
     " Indent top-level form.
     au FileType clojure nmap <buffer> gi mz99[(v%='z
-    " ])
+
 augroup END
 
 " }}}