# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1577460840 18000
# Node ID 1790650ca7326a5bccd9cf8f88138c6a808c84cc
# Parent  deea0d6d9ac42d0afa4f594a13afec951a66ccec# Parent  e15d05d1db454a96f0df61bf9eaf98db971bbcae
Merge.

diff -r e15d05d1db45 -r 1790650ca732 .hgignore
--- a/.hgignore	Fri Dec 27 03:14:26 2019 +0000
+++ b/.hgignore	Fri Dec 27 10:34:00 2019 -0500
@@ -47,3 +47,4 @@
 go/bin
 lisp/man
 mutt/accounts
+weechat/plugins.conf
diff -r e15d05d1db45 -r 1790650ca732 bin/heading
--- a/bin/heading	Fri Dec 27 03:14:26 2019 +0000
+++ b/bin/heading	Fri Dec 27 10:34:00 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 e15d05d1db45 -r 1790650ca732 fish/config.fish
--- a/fish/config.fish	Fri Dec 27 03:14:26 2019 +0000
+++ b/fish/config.fish	Fri Dec 27 10:34:00 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 e15d05d1db45 -r 1790650ca732 lispwords
diff -r e15d05d1db45 -r 1790650ca732 vim/vimrc
--- a/vim/vimrc	Fri Dec 27 03:14:26 2019 +0000
+++ b/vim/vimrc	Fri Dec 27 10:34:00 2019 -0500
@@ -1002,6 +1002,7 @@
     setlocal lispwords+=->>
     setlocal lispwords+=-<>
     setlocal lispwords+=-<>>
+    setlocal lispwords+=_
 
     " alexandria
     setlocal lispwords+=define-constant
diff -r e15d05d1db45 -r 1790650ca732 weechat/plugins.conf
--- a/weechat/plugins.conf	Fri Dec 27 03:14:26 2019 +0000
+++ /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