# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1575217309 18000
# Node ID 7e61dbfc9438bff096f274835c4f30b1f4577778
# Parent  ab8f9b3dbba2ef2fdb62007500533b668c8d77b2# Parent  addae1d12a7c4a17059eaccbbdd3c20505aac279
Merge.

diff -r addae1d12a7c -r 7e61dbfc9438 fish/config.fish
--- a/fish/config.fish	Mon Nov 18 11:11:15 2019 -0500
+++ b/fish/config.fish	Sun Dec 01 11:21:49 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 addae1d12a7c -r 7e61dbfc9438 lisp/retry.lisp
--- a/lisp/retry.lisp	Mon Nov 18 11:11:15 2019 -0500
+++ b/lisp/retry.lisp	Sun Dec 01 11:21:49 2019 -0500
@@ -187,25 +187,17 @@
                 *option-version*)))
 
 
-(defmacro quit-on-ctrl-c (&body body)
-  `(handler-case
-     (progn ,@body)
-     #+sbcl (sb-sys:interactive-interrupt (c)
-               (declare (ignore c))
-               (adopt:exit 130))))
-
-(defun parse-options-or-exit (ui)
-  (handler-case (adopt:parse-options ui)
-    (error (c) (adopt:print-error-and-exit c))))
 
 
 (defun toplevel ()
-  #+sbcl (sb-ext:disable-debugger)
-  (quit-on-ctrl-c
-    (multiple-value-bind (arguments options)
-        (parse-options-or-exit *ui*)
-      (cond
-        ((gethash 'help options) (adopt:print-help-and-exit *ui*))
-        ((gethash 'version options) (write-line *version*) (adopt:exit))
-        (t (adopt:exit (run arguments options)))))))
+  (sb-ext:disable-debugger)
+  (handler-bind
+      (adopt::quit-on-ctrl-c ()
+        (multiple-value-bind (arguments options)
+            (adopt:parse-options *ui*)
+          (cond
+            ((gethash 'help options) (adopt:print-help-and-exit *ui*))
+            ((gethash 'version options) (write-line *version*) (adopt:exit))
+            (t (adopt:exit (run arguments options))))))
+    (error (c) (adopt:print-error-and-exit c))))
 
diff -r addae1d12a7c -r 7e61dbfc9438 lispwords
--- a/lispwords	Mon Nov 18 11:11:15 2019 -0500
+++ b/lispwords	Sun Dec 01 11:21:49 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 addae1d12a7c -r 7e61dbfc9438 weechat/.agignore
--- a/weechat/.agignore	Mon Nov 18 11:11:15 2019 -0500
+++ b/weechat/.agignore	Sun Dec 01 11:21:49 2019 -0500
@@ -1,2 +1,2 @@
-logs
+logs/
 urls.log