7e61dbfc9438
Merge.
| author | Steve Losh <steve@stevelosh.com> |
|---|---|
| date | Sun, 01 Dec 2019 11:21:49 -0500 |
| parents | ab8f9b3dbba2 (diff) addae1d12a7c (current diff) |
| children | ff8f7c88a814 |
| branches/tags | (none) |
| files |
Changes
--- 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
--- 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))))
--- 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)