# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1577374766 18000
# Node ID dbdc482505c1281b595df5ef95c6ab4e3de2d12e
# Parent  57f3131c232a2ecdda1d299816e005360ee60a46# Parent  7c8e9659a1c591e3ea75292a9753d0d04c995aa8
Merge.

diff -r 7c8e9659a1c5 -r dbdc482505c1 bin/heading
--- a/bin/heading	Tue Dec 24 13:49:47 2019 -0500
+++ b/bin/heading	Thu Dec 26 10:39:26 2019 -0500
@@ -4,5 +4,5 @@
 shift
 
 echo
-toilet -t -F gay:crop -f "$FONT" "$@"
+toilet -k -t -F gay:crop -f "$FONT" "$@"
 echo
diff -r 7c8e9659a1c5 -r dbdc482505c1 fish/config.fish
--- a/fish/config.fish	Tue Dec 24 13:49:47 2019 -0500
+++ b/fish/config.fish	Thu Dec 26 10:39:26 2019 -0500
@@ -12,7 +12,7 @@
 function ei; hg -R ~/src/inventory/ pull -u; and nvim ~/src/inventory/inventory.markdown; and hg -R ~/src/inventory/ ci -m 'Update inventory'; and hg -R ~/src/inventory/ push; end
 function em; nvim ~/.mutt/muttrc; end
 function es; nvim ~/.stumpwmrc; end
-function esc; nvim ~/.ssh/config; end
+function essh; nvim ~/.ssh/config; end
 function ev; nvim ~/.vimrc; end
 
 function js; cd ~/scratch; end
diff -r 7c8e9659a1c5 -r dbdc482505c1 lispwords
diff -r 7c8e9659a1c5 -r dbdc482505c1 vim/vimrc
--- a/vim/vimrc	Tue Dec 24 13:49:47 2019 -0500
+++ b/vim/vimrc	Thu Dec 26 10:39:26 2019 -0500
@@ -1002,6 +1002,7 @@
     setlocal lispwords+=->>
     setlocal lispwords+=-<>
     setlocal lispwords+=-<>>
+    setlocal lispwords+=_
 
     " alexandria
     setlocal lispwords+=define-constant
diff -r 7c8e9659a1c5 -r dbdc482505c1 weechat/plugins.conf
--- a/weechat/plugins.conf	Tue Dec 24 13:49:47 2019 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-/home/sjl/Dropbox/Settings/plugins.conf
\ No newline at end of file