From a91df46aa8b8db9e8e8b2b6fb6c9d1835c26be9d Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Fri, 28 Sep 2018 21:59:06 -0400 Subject: [PATCH] bin/doom: revert debug-on-error = t It's too destructive. Will sometimes crash the script with no error output. --- bin/doom | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/bin/doom b/bin/doom index d40557c5e..54885786e 100755 --- a/bin/doom +++ b/bin/doom @@ -82,8 +82,25 @@ (usage) (message "") (error "No command detected, aborting!")) - ((let ((default-directory emacs-dir) - (debug-on-error t)) + ((let ((default-directory emacs-dir)) (setq argv nil noninteractive 'doom) - (doom-dispatch (car args) (cdr args)))))) + (condition-case e + (doom-dispatch (car args) (cdr args)) + (user-error + (signal (car e) (cdr e))) + ((debug error) + (message "--------------------------------------------------\n") + (message "There was an unexpected error:") + (message " %s (%s)" (get (car e) 'error-message) (car e)) + (dolist (item (cdr e)) + (message " %s" item)) + (unless debug-on-error + (message + (concat "\nRun the command again with the -d (or --debug) option to enable debug\n" + "mode and, hopefully, generate a stack trace. If you decide to file a bug\n" + "report, please include it!\n\n" + "Emacs outputs to standard error, so you'll need to redirect stderr to\n" + "stdout to pipe this to a file or clipboard!\n\n" + " e.g. doom -d install 2>&1 | clipboard-program")) + (signal 'doom-error e))))))))