# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1516392366 0
# Node ID 28205343c464b44fd36970d2588a74183ff73299
# Parent  f34fe92ef63c33de87d82728e085e00c34ec09ef# Parent  3ab791da67778c481c3759bda40bf6b170006389
Merge.

diff -r f34fe92ef63c -r 28205343c464 .hgsubstate
--- a/.hgsubstate	Fri Jan 19 20:05:03 2018 +0000
+++ b/.hgsubstate	Fri Jan 19 20:06:06 2018 +0000
@@ -1,4 +1,4 @@
-dc481ce24b602720746967f40a93b65c45cdd0f8 mercurial/hg-prompt
+4dddc56c4c4b420c91d4a9b20e8f9589953b3fde mercurial/hg-prompt
 1fc4a9fbead7e0acc4c828b346f3be2658ec3df9 mercurial/templates
 b6a8b49e2173ba5a1b34d00e68e0ed8addac3ebd vim/bundle/abolish
 a16a9b63eb85cc0960a7f25c54647ac1f99f3360 vim/bundle/ack
diff -r f34fe92ef63c -r 28205343c464 bin/abcl
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bin/abcl	Fri Jan 19 20:06:06 2018 +0000
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+rlwrap-lisp /usr/local/bin/abcl "$@"
diff -r f34fe92ef63c -r 28205343c464 bin/abcl-nrepl
--- a/bin/abcl-nrepl	Fri Jan 19 20:05:03 2018 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-abcl --eval "(ql:quickload 'nrepl)" --eval "(nrepl:start-server)" "$@"
diff -r f34fe92ef63c -r 28205343c464 bin/arduino-serial
--- a/bin/arduino-serial	Fri Jan 19 20:05:03 2018 +0000
+++ b/bin/arduino-serial	Fri Jan 19 20:06:06 2018 +0000
@@ -1,3 +1,10 @@
 #!/usr/bin/env bash
 
-rlwrap -I -m @ -M .lisp -a ___ -O '^[a-zA-Z0-9]+>' -p BLUE -q '"' python2 -m serial.tools.miniterm /dev/cu.usbmodem* 9600 --exit-char 38 --eol LF
+rlwrap --pass-sigint-as-sigterm \
+       -m@ \
+       --multi-line-ext .lisp \
+       -a___ \
+       --only-cook '^[a-zA-Z0-9]+>' \
+       -pBLUE \
+       --quote-characters '"' \
+       python2 -m serial.tools.miniterm /dev/cu.*usb* 9600 --exit-char 38 --eol LF
diff -r f34fe92ef63c -r 28205343c464 bin/ccl
--- a/bin/ccl	Fri Jan 19 20:05:03 2018 +0000
+++ b/bin/ccl	Fri Jan 19 20:06:06 2018 +0000
@@ -1,1 +1,6 @@
-ccl-rlwrap
\ No newline at end of file
+#!/usr/bin/env bash
+
+set -e
+rlwrap-lisp /usr/local/bin/ccl64 "$@"
+# /usr/local/bin/ccl "$@"
+
diff -r f34fe92ef63c -r 28205343c464 bin/ccl-nrepl
--- a/bin/ccl-nrepl	Fri Jan 19 20:05:03 2018 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-ccl-rlwrap --eval "(ql:quickload 'nrepl)" --eval "(nrepl:start-server)" "$@"
diff -r f34fe92ef63c -r 28205343c464 bin/ccl-rlwrap
--- a/bin/ccl-rlwrap	Fri Jan 19 20:05:03 2018 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-rlwrap /usr/local/bin/ccl64 "$@"
-# /usr/local/bin/ccl "$@"
-
diff -r f34fe92ef63c -r 28205343c464 bin/ccl-vlime
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bin/ccl-vlime	Fri Jan 19 20:06:06 2018 +0000
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+set -e
+ccl --eval "(load \"~/lib/dotfiles/vim/bundle/vlime/lisp/start-vlime.lisp\")" "$@"
diff -r f34fe92ef63c -r 28205343c464 bin/code-to-pdf
--- a/bin/code-to-pdf	Fri Jan 19 20:05:03 2018 +0000
+++ b/bin/code-to-pdf	Fri Jan 19 20:06:06 2018 +0000
@@ -8,7 +8,6 @@
     --header '%H - $N | | page $% of $= in file $v' \
     --font "Menlo-Regular@8.5" \
     --header-font "Menlo-Bold@10" \
-    --margins=60:60:18:60 \
     --fancy-header=sjl \
     --title "$TITLE" \
     --baselineskip 3 \
@@ -16,7 +15,10 @@
     --highlight \
     --color \
     --mark-wrapped-lines=arrow \
+    --landscape \
+    --margins=20:40:30:30 \
     -p - \
     --word-wrap $* \
     | pstopdf -i -o code.pdf
 
+    # --margins=60:60:18:60 \
diff -r f34fe92ef63c -r 28205343c464 bin/ecl
--- a/bin/ecl	Fri Jan 19 20:05:03 2018 +0000
+++ b/bin/ecl	Fri Jan 19 20:06:06 2018 +0000
@@ -1,1 +1,3 @@
-ecl-rlwrap
\ No newline at end of file
+#!/usr/bin/env bash
+
+rlwrap-lisp /usr/local/bin/ecl "$@"
diff -r f34fe92ef63c -r 28205343c464 bin/ecl-nrepl
--- a/bin/ecl-nrepl	Fri Jan 19 20:05:03 2018 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-ecl-rlwrap --eval "(ql:quickload 'nrepl)" --eval "(nrepl:start-server)" "$@"
diff -r f34fe92ef63c -r 28205343c464 bin/ecl-rlwrap
--- a/bin/ecl-rlwrap	Fri Jan 19 20:05:03 2018 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-rlwrap ros -L ecl run -l ~/.eclrc "$@"
diff -r f34fe92ef63c -r 28205343c464 bin/heading
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bin/heading	Fri Jan 19 20:06:06 2018 +0000
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+echo
+figlet -kf $1 $2 | sed -Ee 's/ +$$//' | tr -s '\n' | lolcat --freq=0.25
+echo
diff -r f34fe92ef63c -r 28205343c464 bin/rlwrap-lisp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bin/rlwrap-lisp	Fri Jan 19 20:06:06 2018 +0000
@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+rlwrap -m@ \
+       --multi-line-ext .lisp \
+       -a___ \
+       --only-cook '^\[[a-zA-Z ]+\] [-a-zA-Z0-9._]+>' \
+       -pBLUE \
+       --quote-characters '"' \
+       --histsize 1000 \
+       --history-filename "$HOME/.rlwrap-lisp-history" \
+       "$@"
diff -r f34fe92ef63c -r 28205343c464 bin/sbcl
--- a/bin/sbcl	Fri Jan 19 20:05:03 2018 +0000
+++ b/bin/sbcl	Fri Jan 19 20:06:06 2018 +0000
@@ -1,1 +1,4 @@
-sbcl-rlwrap
\ No newline at end of file
+#!/usr/bin/env bash
+
+set -e
+rlwrap-lisp /usr/local/bin/sbcl --noinform "$@"
diff -r f34fe92ef63c -r 28205343c464 bin/sbcl-nrepl
--- a/bin/sbcl-nrepl	Fri Jan 19 20:05:03 2018 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-sbcl-rlwrap --eval "(ql:quickload 'nrepl)" --eval "(nrepl:start-server)" "$@"
diff -r f34fe92ef63c -r 28205343c464 bin/sbcl-rlwrap
--- a/bin/sbcl-rlwrap	Fri Jan 19 20:05:03 2018 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-rlwrap --histsize 1000 --history-filename "$HOME/.rlwrap-lisp-history" -- /usr/local/bin/sbcl --noinform --dynamic-space-size 4000 "$@"
diff -r f34fe92ef63c -r 28205343c464 bin/sbcl-vlime
--- a/bin/sbcl-vlime	Fri Jan 19 20:05:03 2018 +0000
+++ b/bin/sbcl-vlime	Fri Jan 19 20:06:06 2018 +0000
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 
 set -e
-sbcl-rlwrap --eval "(load \"~/lib/dotfiles/vim/bundle/vlime/lisp/start-vlime.lisp\")" "$@"
+sbcl --eval "(load \"~/lib/dotfiles/vim/bundle/vlime/lisp/start-vlime.lisp\")" "$@"
diff -r f34fe92ef63c -r 28205343c464 eclrc
--- a/eclrc	Fri Jan 19 20:05:03 2018 +0000
+++ b/eclrc	Fri Jan 19 20:06:06 2018 +0000
@@ -1,4 +1,4 @@
-(setf compiler:*user-cc-flags* "-Wno-shift-negative-value")
+(setf compiler::*user-cc-flags* "-Wno-shift-negative-value")
 
 (defvar *last-package* nil)
 (defvar *cached-prompt* nil)
@@ -14,3 +14,10 @@
   (princ *cached-prompt*))
 
 (setf system:*tpl-prompt-hook* #'sjl-prompt)
+
+
+#-quicklisp
+(let ((quicklisp-init (merge-pathnames ".quicklisp/setup.lisp"
+                                    (user-homedir-pathname))))
+ (when (probe-file quicklisp-init)
+    (load quicklisp-init)))
diff -r f34fe92ef63c -r 28205343c464 fish/functions/ep.fish
--- a/fish/functions/ep.fish	Fri Jan 19 20:05:03 2018 +0000
+++ b/fish/functions/ep.fish	Fri Jan 19 20:06:06 2018 +0000
@@ -1,3 +1,7 @@
 function ep -d "Edit .plan"
-    nvim ~/.plan/README.markdown; and hg -R ~/.plan ci -m 'Update'
+    hg -R ~/.plan pull -u
+    nvim ~/.plan/README.markdown
+    hg -R ~/.plan ci -m 'Update'
+    hg -R ~/.plan push
+    hg -R ~/.plan push git
 end
diff -r f34fe92ef63c -r 28205343c464 hgignore
--- a/hgignore	Fri Jan 19 20:05:03 2018 +0000
+++ b/hgignore	Fri Jan 19 20:06:06 2018 +0000
@@ -5,3 +5,4 @@
 tags
 tags.bak
 *.fasl
+*.dx64fsl
diff -r f34fe92ef63c -r 28205343c464 inputrc
--- a/inputrc	Fri Jan 19 20:05:03 2018 +0000
+++ b/inputrc	Fri Jan 19 20:06:06 2018 +0000
@@ -5,4 +5,6 @@
 set output-meta on 
 set convert-meta off
 
-"\C-i": rlwrap-call-editor
+"\C-o": rlwrap-call-editor
+
+
diff -r f34fe92ef63c -r 28205343c464 vim/vimrc
--- a/vim/vimrc	Fri Jan 19 20:05:03 2018 +0000
+++ b/vim/vimrc	Fri Jan 19 20:06:06 2018 +0000
@@ -165,6 +165,7 @@
 set wildignore+=*.orig                           " Merge resolution files
 
 set wildignore+=*.fasl                           " Lisp FASLs
+set wildignore+=*.dx64fsl                        " CCL
 
 " Clojure/Leiningen
 set wildignore+=classes
@@ -540,7 +541,6 @@
 nnoremap <leader>el :vsplit ~/.lispwords<cr>
 nnoremap <leader>em :vsplit ~/.mutt/muttrc<cr>
 nnoremap <leader>ep :vsplit ~/.plan/README.markdown<cr>
-nnoremap <leader>ep :!vim ~/.plan/README.markdown && hg -R ~/.plan ci -m 'Update'<cr>
 nnoremap <leader>eq :vsplit ~/Dropbox/quotes.txt<cr>Gzz
 nnoremap <leader>et :vsplit ~/.tmux.conf<cr>
 nnoremap <leader>ev :vsplit ~/.vimrc<cr>
@@ -997,11 +997,9 @@
 
 function! OpenLispReplSBCL() "{{{
     NeoRepl sbcl-vlime
-    call InitializeLispRepl()
 endfunction "}}}
 function! OpenLispReplCCL() "{{{
-    NeoRepl ccl-nrepl
-    call InitializeLispRepl()
+    NeoRepl ccl-vlime
 endfunction "}}}
 function! OpenLispReplECL() "{{{
     NeoRepl ecl-nrepl
@@ -1648,6 +1646,20 @@
 augroup END
 
 " }}}
+" .plan {{{
+
+function! PlanLinkPaste()
+    execute "normal! gg}}O[]: \<esc>\"*p0"
+    normal! a
+endfunction
+
+augroup ft_plan
+    au!
+
+    au BufNewFile,BufRead ~/.plan/README.markdown nnoremap <buffer> <localleader>l :call PlanLinkPaste()<cr>
+augroup END
+
+" }}}
 " Postgresql {{{
 
 augroup ft_postgres
@@ -2297,6 +2309,7 @@
                     \ '^tags$',
                     \ '^.*\.meta$',
                     \ '^.*\.fasl$',
+                    \ '^.*\.dx64fsl$',
                     \ '.*\.bcf$', '.*\.blg$', '.*\.fdb_latexmk$', '.*\.bbl$', '.*\.aux$', '.*\.run.xml$', '.*\.fls$',
                     \ '.*\.midi$']
 
diff -r f34fe92ef63c -r 28205343c464 weechat/weechat.conf
--- a/weechat/weechat.conf	Fri Jan 19 20:05:03 2018 +0000
+++ b/weechat/weechat.conf	Fri Jan 19 20:06:06 2018 +0000
@@ -236,7 +236,7 @@
 nicklist.conditions = "nicklist"
 nicklist.filling_left_right = vertical
 nicklist.filling_top_bottom = columns_vertical
-nicklist.hidden = off
+nicklist.hidden = on
 nicklist.items = "buffer_nicklist"
 nicklist.position = right
 nicklist.priority = 200