--- a/.hgignore Thu Feb 08 20:08:57 2018 +0000
+++ b/.hgignore Fri Feb 09 17:17:48 2018 +0000
@@ -43,5 +43,4 @@
roswell/compile-parenscript
weechat/slack.cache
vim/bundle/_wat
-vim/bundle/simple-scala
-vim/bundle/LanguageClient-neovim
+=======
--- a/.hgsub Thu Feb 08 20:08:57 2018 +0000
+++ b/.hgsub Fri Feb 09 17:17:48 2018 +0000
@@ -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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/bin/sbcl-raw Fri Feb 09 17:17:48 2018 +0000
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+set -e
+/usr/local/bin/sbcl --noinform "$@"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/bin/sbcl-vlime-raw Fri Feb 09 17:17:48 2018 +0000
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+set -e
+sbcl-raw --eval "(load \"~/lib/dotfiles/vim/bundle/vlime/lisp/start-vlime.lisp\")" "$@"
--- a/lispwords Thu Feb 08 20:08:57 2018 +0000
+++ b/lispwords Fri Feb 09 17:17:48 2018 +0000
@@ -100,3 +100,12 @@
; conspack
(1 tracking-refs)
+
+; asdf
+(1 test-op)
+
+; ppcre
+(2 register-groups-bind)
+
+; lparallel
+(1 pdotimes)
--- a/vim/ftplugin/lisp/lispfolding.vim Thu Feb 08 20:08:57 2018 +0000
+++ b/vim/ftplugin/lisp/lispfolding.vim Fri Feb 09 17:17:48 2018 +0000
@@ -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) =~ '^$'
--- a/vim/vimrc Thu Feb 08 20:08:57 2018 +0000
+++ b/vim/vimrc Fri Feb 09 17:17:48 2018 +0000
@@ -981,6 +981,11 @@
function! OpenLispReplSBCL() "{{{
NeoRepl sbcl-vlime
endfunction "}}}
+
+function! OpenLispReplSBCLRaw() "{{{
+ NeoRepl sbcl-vlime-raw
+endfunction "}}}
+
function! OpenLispReplCCL() "{{{
NeoRepl ccl-vlime
endfunction "}}}
@@ -1194,6 +1199,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>
@@ -1202,6 +1210,7 @@
au FileType lisp nnoremap <buffer> <silent> <localleader>Oc :call OpenLispReplCCL()<cr>
au FileType lisp nnoremap <buffer> <silent> <localleader>Oe :call OpenLispReplECL()<cr>
au FileType lisp nnoremap <buffer> <silent> <localleader>Oa :call OpenLispReplABCL()<cr>
+ au FileType lisp nnoremap <buffer> <silent> <localleader>Ors :call OpenLispReplSBCLRaw()<cr>
" Misc mappings
" au FileType lisp nnoremap <buffer> gi :call IndentToplevelLispForm()<cr>