# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1516480718 18000
# Node ID 9469fc3d271f48c71af5814a4545a7fb90c70621
# Parent  3277da5053a66c1c6a785c5844c09a9c04513645# Parent  28205343c464b44fd36970d2588a74183ff73299
Merge.

diff -r 28205343c464 -r 9469fc3d271f .hgignore
--- a/.hgignore	Fri Jan 19 20:06:06 2018 +0000
+++ b/.hgignore	Sat Jan 20 15:38:38 2018 -0500
@@ -43,5 +43,4 @@
 roswell/compile-parenscript
 weechat/slack.cache
 vim/bundle/_wat
-vim/bundle/simple-scala
-vim/bundle/LanguageClient-neovim
+=======
diff -r 28205343c464 -r 9469fc3d271f .hgsub
--- a/.hgsub	Fri Jan 19 20:06:06 2018 +0000
+++ b/.hgsub	Sat Jan 20 15:38:38 2018 -0500
@@ -40,5 +40,5 @@
 vim/bundle/targets               = [git]git://github.com/wellle/targets.vim.git
 vim/bundle/vimtex                = [git]git://github.com/lervag/vimtex.git
 vim/bundle/vitality              = [hg]https://bitbucket.org/sjl/vitality.vim
-vim/bundle/vlime                 = [git]git://github.com/l04m33/vlime.git
+vim/bundle/vlime                 = [git]git://github.com/sjl/vlime.git
 vim/bundle/windowswap            = [git]git://github.com/wesQ3/vim-windowswap.git
diff -r 28205343c464 -r 9469fc3d271f .hgsubstate
--- a/.hgsubstate	Fri Jan 19 20:06:06 2018 +0000
+++ b/.hgsubstate	Sat Jan 20 15:38:38 2018 -0500
@@ -40,5 +40,5 @@
 f6f2d6618a321f5b0065586a7bc934325fec81ab vim/bundle/targets
 5d5c71044880443035e07009497962feacb56b20 vim/bundle/vimtex
 bf3fd7f67e730f93765bd3c1cfcdb18fd4043521 vim/bundle/vitality
-065b95f3ac7a455314c2bdefeb2b792f290034df vim/bundle/vlime
+bc3ea6be7274265c85bd9ab3416357a233436f4e vim/bundle/vlime
 6876fe38b33732cb124d415ffc4156f16da5e118 vim/bundle/windowswap
diff -r 28205343c464 -r 9469fc3d271f lispwords
--- a/lispwords	Fri Jan 19 20:06:06 2018 +0000
+++ b/lispwords	Sat Jan 20 15:38:38 2018 -0500
@@ -100,3 +100,9 @@
 
 ; conspack
 (1 tracking-refs)
+
+; asdf
+(1 test-op)
+
+; ppcre
+(2 register-groups-bind)
diff -r 28205343c464 -r 9469fc3d271f vim/ftplugin/lisp/lispfolding.vim
--- a/vim/ftplugin/lisp/lispfolding.vim	Fri Jan 19 20:06:06 2018 +0000
+++ b/vim/ftplugin/lisp/lispfolding.vim	Sat Jan 20 15:38:38 2018 -0500
@@ -158,7 +158,7 @@
             return "-1"
         elseif s:ShouldFoldToplevel(getline(a:lnum))
             return ">1"
-        elseif getline(a:lnum) =~ '^(def'
+        elseif getline(a:lnum) =~ '\v^\(([^ ]+:)?def'
             " fuck it just fold everything that looks kinda deffy
             return ">1"
         elseif getline(a:lnum) =~ '^(let '
@@ -166,10 +166,6 @@
             return ">1"
         elseif getline(a:lnum) =~ '^(in-package'
             return "0"
-        elseif getline(a:lnum) =~ '^(adt:defdata'
-            return ">1"
-        elseif getline(a:lnum) =~ '^(opts:define-opts'
-            return ">1"
         elseif getline(a:lnum) =~ '^$' && getline(a:lnum - 1) =~ '^$'
             return "0"
         elseif getline(a:lnum) =~ '^$'
diff -r 28205343c464 -r 9469fc3d271f vim/vimrc
--- a/vim/vimrc	Fri Jan 19 20:06:06 2018 +0000
+++ b/vim/vimrc	Sat Jan 20 15:38:38 2018 -0500
@@ -1211,6 +1211,9 @@
     au FileType lisp setlocal lisp
     au FileType lisp setlocal equalprg=lispindent
 
+    " Fix windows
+    au FileType lisp nnoremap <buffer> <localleader>W <c-w>j<c-w>J<c-w>k<c-w>H
+
     " scratch buffer
     au FileType lisp nnoremap <buffer> <leader><tab> :e scratch.lisp<cr>