# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1547487072 18000
# Node ID 52107888f30afc024281bbfd0a276cf93d9ce969
# Parent  a8a82a63b876e44830d9059655808b14ffdf1cb3# Parent  c3b026046776a21c6fa314b210f351331bb553e7
Merge.

diff -r c3b026046776 -r 52107888f30a .hgsubstate
--- a/.hgsubstate	Thu Jan 10 20:37:36 2019 -0500
+++ b/.hgsubstate	Mon Jan 14 12:31:12 2019 -0500
@@ -2,12 +2,12 @@
 1fc4a9fbead7e0acc4c828b346f3be2658ec3df9 mercurial/templates
 b6a8b49e2173ba5a1b34d00e68e0ed8addac3ebd vim/bundle/abolish
 a16a9b63eb85cc0960a7f25c54647ac1f99f3360 vim/bundle/ack
-5e4a535e2d239cba3db19b6b79abedbc7c541727 vim/bundle/badwolf
+1f53767227f0931e00a9e31e44c13633e563cd4c vim/bundle/badwolf
 b542a7bc4d9bc5da8fb12e110fe7975131fb57a4 vim/bundle/clam
 8295187ea1210138c0b171d8e3ec3569936f4c1a vim/bundle/commentary
 c6d1fc5e58d689bfb104ff336aeb89d9ef1b48e2 vim/bundle/ctrlp
 38487bbec8ba50834e257940b357de03991fa8f9 vim/bundle/delimitmate
-196e44837555e0e05080e6bc9dfc5605a06eaabb vim/bundle/fugitive
+085060002106f591e399fc5a82fa3fafc7586bca vim/bundle/fugitive
 127d706f2def96876605e6bd5d366c973cb8e406 vim/bundle/gdl
 6ea4e1983b18cf440c8f800a3e94b57338a3e99f vim/bundle/glsl
 7fcea1a08423da3012aac87f5224738c85d212a1 vim/bundle/gnupg
diff -r c3b026046776 -r 52107888f30a bin/sprint
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bin/sprint	Mon Jan 14 12:31:12 2019 -0500
@@ -0,0 +1,31 @@
+#!/usr/bin/env bash
+
+# Usage:
+#
+#     sprint './some-command foo' pidfile
+#
+# Then another process can:
+#
+#     kill `cat pidfile`
+#
+# to refresh the underlying process.
+
+set -euo pipefail
+set -m
+
+PROGRAM="$1"
+shift
+PIDFILE="$1"
+shift
+
+echo "Starting ${PROGRAM}"
+while true; do
+    ${PROGRAM} &
+    echo $! > "${PIDFILE}"
+    fg >/dev/null || true
+    rm "${PIDFILE}"
+
+    echo "Restarting ${PROGRAM}"
+    sleep 1
+done
+
diff -r c3b026046776 -r 52107888f30a ffignore
--- a/ffignore	Thu Jan 10 20:37:36 2019 -0500
+++ b/ffignore	Mon Jan 14 12:31:12 2019 -0500
@@ -4,6 +4,7 @@
 banner.txt
 UnityTempFile
 .m2
+node_modules
 
 syntax:regex
 \btags$
diff -r c3b026046776 -r 52107888f30a gitconfig
--- a/gitconfig	Thu Jan 10 20:37:36 2019 -0500
+++ b/gitconfig	Mon Jan 14 12:31:12 2019 -0500
@@ -56,7 +56,7 @@
     delete-local-reference-to-remote-branch = "!sh -c 'git branch -rd $1/$2' -"
     delete-remote-branch = "!sh -c 'git push $1 --delete $2' -"
     delete-branch = "!sh -c 'git delete-local-branch $1; git remotes | cut -f1 | sort | uniq | xargs -n1 -I % git delete-local-reference-to-remote-branch % $1' -"
-    delete-current-branch = "!bash -c 'git checkout master && git delete-branch $1' - $(git currentbranch)"
+    delete-current-branch = "!bash -c 'git checkout master && git delete-branch $1' - $(git current-branch)"
 
     current-branch = rev-parse --abbrev-ref HEAD
 
@@ -66,11 +66,11 @@
     po = push origin
     pu = push upstream
 
-    mo = !git merge --no-ff origin/`git currentbranch`
-    mu = !git merge --no-ff upstream/`git currentbranch`
+    mo = !git merge --no-ff origin/`git current-branch`
+    mu = !git merge --no-ff upstream/`git current-branch`
 
-    uo = !git merge --ff-only origin/`git currentbranch`
-    uu = !git merge --ff-only upstream/`git currentbranch`
+    uo = !git merge --ff-only origin/`git current-branch`
+    uu = !git merge --ff-only upstream/`git current-branch`
 
     fuu = "!sh -c 'git fu && git uu' -"
     fuo = "!sh -c 'git fo && git uo' -"
diff -r c3b026046776 -r 52107888f30a lisprc
--- a/lisprc	Thu Jan 10 20:37:36 2019 -0500
+++ b/lisprc	Mon Jan 14 12:31:12 2019 -0500
@@ -9,3 +9,17 @@
       *print-miser-width* nil
       *print-length* 1000
       *print-level* 250)
+
+
+; (defun prefix= (needle haystack)
+;   (string= needle haystack :end2 (min (length haystack) (length needle))))
+;
+; (defun https-please (url &rest args)
+;   ;; http://beta.quicklisp.org/
+;   (if (prefix= "http://beta.quicklisp.org/" url)
+;     (setf url (concatenate 'string "https://beta.quicklisp.org:443/"
+;                            (subseq url 26))))
+;   (print `(fetching ,url))
+;   (apply #'ql-http:http-fetch url args))
+;
+; (setf ql-http:*fetch-scheme-functions* '(("http" . https-please)))
diff -r c3b026046776 -r 52107888f30a vim/custom-dictionary.utf-8.add
--- a/vim/custom-dictionary.utf-8.add	Thu Jan 10 20:37:36 2019 -0500
+++ b/vim/custom-dictionary.utf-8.add	Mon Jan 14 12:31:12 2019 -0500
@@ -270,5 +270,7 @@
 jQuery
 deserializes
 healthchecks
+Nginx
+architecting
 CACL
 shaders
diff -r c3b026046776 -r 52107888f30a vim/vimrc
--- a/vim/vimrc	Thu Jan 10 20:37:36 2019 -0500
+++ b/vim/vimrc	Mon Jan 14 12:31:12 2019 -0500
@@ -1118,6 +1118,7 @@
     au BufNewFile,BufRead *.asd,*.ros set filetype=lisp
     au BufNewFile,BufRead *.paren set filetype=lisp
     au BufNewFile,BufRead .abclrc set filetype=lisp
+    au BufNewFile,BufRead .lisprc set filetype=lisp
     au BufNewFile,BufRead .stumpwmrc set filetype=lisp
 
     au FileType lisp nnoremap <buffer> U :syntax sync fromstart<cr>:redraw!<cr>:call TurnOnLispFolding()<cr>