# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1468536337 0
# Node ID 171b0efe559dbe1fe53cdd5d9059a3a39e8adc55
# Parent  622e08ad5e40d56b7346fa5b7e8321d53b825c79
ECL and more

diff -r 622e08ad5e40 -r 171b0efe559d bin/bootstrap.sh
--- a/bin/bootstrap.sh	Wed Jul 13 12:29:14 2016 +0000
+++ b/bin/bootstrap.sh	Thu Jul 14 22:45:37 2016 +0000
@@ -52,6 +52,7 @@
 ensure_link "lib/dotfiles/fish/functions"      ".config/fish/functions"
 ensure_link "lib/dotfiles/ipython"             ".ipython"
 ensure_link "lib/dotfiles/sbclrc"              ".sbclrc"
+ensure_link "lib/dotfiles/eclrc"               ".eclrc"
 ensure_link "lib/dotfiles/ccl-init.lisp"       ".ccl-init.lisp"
 
 echo remember to copy the notmuch-config
diff -r 622e08ad5e40 -r 171b0efe559d bin/ccl-nrepl
--- a/bin/ccl-nrepl	Wed Jul 13 12:29:14 2016 +0000
+++ b/bin/ccl-nrepl	Thu Jul 14 22:45:37 2016 +0000
@@ -1,5 +1,4 @@
 #!/usr/bin/env bash
 
 set -e
-
 ccl-rlwrap --eval "(ql:quickload 'nrepl)" --eval "(nrepl:start-server)" "$@"
diff -r 622e08ad5e40 -r 171b0efe559d bin/ccl-rlwrap
--- a/bin/ccl-rlwrap	Wed Jul 13 12:29:14 2016 +0000
+++ b/bin/ccl-rlwrap	Thu Jul 14 22:45:37 2016 +0000
@@ -1,5 +1,4 @@
 #!/usr/bin/env bash
 
+set -e
 rlwrap ros -L ccl-bin run -l ~/.ccl-init.lisp "$@"
-# roswell performance ccl is fucked atm, see here https://github.com/roswell/roswell/issues/141
-# rlwrap /usr/local/bin/ccl64 "$@"
diff -r 622e08ad5e40 -r 171b0efe559d bin/ecl-nrepl
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bin/ecl-nrepl	Thu Jul 14 22:45:37 2016 +0000
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+set -e
+ecl-rlwrap --eval "(ql:quickload 'nrepl)" --eval "(nrepl:start-server)" "$@"
diff -r 622e08ad5e40 -r 171b0efe559d bin/ecl-rlwrap
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bin/ecl-rlwrap	Thu Jul 14 22:45:37 2016 +0000
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+set -e
+rlwrap ros -L ecl run -l ~/.eclrc "$@"
diff -r 622e08ad5e40 -r 171b0efe559d bin/sbcl-nrepl
--- a/bin/sbcl-nrepl	Wed Jul 13 12:29:14 2016 +0000
+++ b/bin/sbcl-nrepl	Thu Jul 14 22:45:37 2016 +0000
@@ -1,5 +1,4 @@
 #!/usr/bin/env bash
 
 set -e
-
 sbcl-rlwrap --eval "(ql:quickload 'nrepl)" --eval "(nrepl:start-server)" "$@"
diff -r 622e08ad5e40 -r 171b0efe559d bin/sbcl-rlwrap
--- a/bin/sbcl-rlwrap	Wed Jul 13 12:29:14 2016 +0000
+++ b/bin/sbcl-rlwrap	Thu Jul 14 22:45:37 2016 +0000
@@ -1,3 +1,4 @@
 #!/usr/bin/env bash
 
+set -e
 rlwrap ros -L sbcl run -l ~/.sbclrc "$@"
diff -r 622e08ad5e40 -r 171b0efe559d eclrc
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eclrc	Thu Jul 14 22:45:37 2016 +0000
@@ -0,0 +1,1 @@
+(setf compiler:*user-cc-flags* "-Wno-shift-negative-value")
diff -r 622e08ad5e40 -r 171b0efe559d hgrc
--- a/hgrc	Wed Jul 13 12:29:14 2016 +0000
+++ b/hgrc	Thu Jul 14 22:45:37 2016 +0000
@@ -1,6 +1,6 @@
 [ui]
 username = Steve Losh <steve@stevelosh.com>
-editor = vim
+editor = nvim
 commitsubrepos = False
 ignore = ~/.hgignore
 
@@ -52,13 +52,13 @@
 unified = 5
 
 [extdiff]
-cmd.vd = vim
+cmd.vd = nvim
 opts.vd = -c 'set lines=70' -c 'set columns=240' '+next' '+execute "DirDiff" argv(0) argv(1)'
 cmd.ksdiff = /usr/local/bin/ksdiff
 opts.ksdiff = --changeset --wait --filelist
 
 [merge-tools]
-splice.executable = vim
+splice.executable = nvim
 splice.args = -f $base $local $other $output -c 'SpliceInit'
 splice.premerge = keep
 splice.priority = 1
@@ -145,7 +145,7 @@
 d = diff -p --color=auto
 
 # Run a colored diff and pipe it to less.
-dl = !"$HG" diff -p --color=never $@ | vim -R -c 'set ft=diff' -
+dl = !"$HG" diff -p --color=never $@ | nvim -R -c 'set ft=diff' -
 
 # Kaleidoscope
 # Mnemonics: "kaleidoscope diff" and "kaleidoscope show"
@@ -239,8 +239,8 @@
           $HG commit `$HG root`/.hgignore -Am 'Add "$@" to .hgignore.'
 
 # Show in Vim
-vshow = !$HG show $@ | vim -c ':AnsiEsc' -c 'setlocal buftype=nofile' -
-vdiff = !$HG diff -p --color=always $@ | vim -c ':AnsiEsc' -c 'setlocal buftype=nofile' -
+vshow = !$HG show $@ | nvim -c ':AnsiEsc' -c 'setlocal buftype=nofile' -
+vdiff = !$HG diff -p --color=always $@ | nvim -c ':AnsiEsc' -c 'setlocal buftype=nofile' -
 
 # Ack for non-ignored files
 ack = !$HG locate "set:not ignored()" | xargs ack $@
diff -r 622e08ad5e40 -r 171b0efe559d vim/vimrc
--- a/vim/vimrc	Wed Jul 13 12:29:14 2016 +0000
+++ b/vim/vimrc	Thu Jul 14 22:45:37 2016 +0000
@@ -282,7 +282,6 @@
 
 " Save
 nnoremap s :w<cr>
-nnoremap :w<cr> :call input("NOPE!")<cr>
 
 " Man
 nnoremap M K
@@ -359,6 +358,7 @@
 nnoremap <leader>ww mz:%s/\s\+$//<cr>:let @/=''<cr>`z
 
 " Send visual selection to paste.stevelosh.com
+" TODO: fix this
 vnoremap <c-p> :w !curl -sF 'sprunge=<-' 'http://paste.stevelosh.com' \| tr -d '\n ' \| pbcopy && open `pbpaste`<cr>
 
 " Select entire buffer
@@ -458,7 +458,7 @@
 nnoremap vv ^vg_
 
 " Sudo to write
-cnoremap w!! w !sudo tee % >/dev/null
+" cnoremap w!! w !sudo tee % >/dev/null
 
 " Typos
 command! -bang E e<bang>
@@ -871,6 +871,10 @@
     NeoRepl ccl-nrepl
     call HighlightLispRepl()
 endfunction "}}}
+function! OpenLispReplECL() "{{{
+    NeoRepl ecl-nrepl
+    call HighlightLispRepl()
+endfunction "}}}
 
 function! SetLispWords() "{{{
     setlocal isk+=.
@@ -1008,6 +1012,8 @@
     au BufNewFile,BufRead *.asd,*.ros set filetype=lisp
     au BufNewFile,BufRead *.paren set filetype=lisp
 
+    au FileType lisp nnoremap <buffer> U :syntax sync fromstart<cr>:redraw!<cr>:call TurnOnLispFolding()<cr>
+
     au FileType lisp call SetLispWords()
 
     au FileType lisp RainbowParenthesesActivate
@@ -1045,6 +1051,7 @@
     au FileType lisp silent! call OozeMapKeys()
     au FileType lisp nnoremap <buffer> <silent> <localleader>os :call OpenLispReplSBCL()<cr>
     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>s :call SendToplevelLispForm()<cr>
     au FileType lisp nnoremap <buffer> <silent> <localleader>c :call NeoReplSendRaw("nil\n")<cr>:sleep 20m<cr>:call NeoReplSendRaw("")<cr>
     au FileType lisp nnoremap <buffer> gi :call IndentToplevelLispForm()<cr>