# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1575667991 18000
# Node ID ff8f7c88a81491ba809a693ff3f1237e96e672d8
# Parent  7e61dbfc9438bff096f274835c4f30b1f4577778# Parent  a97e2a0c01e453e44d5d9e041bd3303766fb3be2
Merge.

diff -r a97e2a0c01e4 -r ff8f7c88a814 fish/config.fish
--- a/fish/config.fish	Fri Dec 06 10:42:52 2019 -0500
+++ b/fish/config.fish	Fri Dec 06 16:33:11 2019 -0500
@@ -12,6 +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 ev; nvim ~/.vimrc; end
 
 function js; cd ~/scratch; end
diff -r a97e2a0c01e4 -r ff8f7c88a814 lisp/retry.lisp
diff -r a97e2a0c01e4 -r ff8f7c88a814 lispwords
--- a/lispwords	Fri Dec 06 10:42:52 2019 -0500
+++ b/lispwords	Fri Dec 06 16:33:11 2019 -0500
@@ -123,15 +123,18 @@
 ; adopt
 (2 define-interface)
 (1 make-option)
+(1 quit-on-ctrl-c)
 
 ; boots
 (1 make-widget)
 
+; metabang-bind
+(1 bind)
+
 ; makerlisp
 (1 if-lets)
 (1 lets)
 (1 macro)
-(2 bind)
 (1 dovec)
 (1 dolist)
 
diff -r a97e2a0c01e4 -r ff8f7c88a814 weechat/.agignore
--- a/weechat/.agignore	Fri Dec 06 10:42:52 2019 -0500
+++ b/weechat/.agignore	Fri Dec 06 16:33:11 2019 -0500
@@ -1,2 +1,2 @@
-logs
+logs/
 urls.log