From 2ee177d588723420ea8c7db6962813634ff6784e Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Thu, 2 Aug 2018 16:41:19 +0200 Subject: [PATCH] Don't invoke debugger on "Aborted" messages --- core/autoload/packages.el | 6 +++--- core/core-cli.el | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/autoload/packages.el b/core/autoload/packages.el index 13c03d121..d6b5624e7 100644 --- a/core/autoload/packages.el +++ b/core/autoload/packages.el @@ -483,7 +483,7 @@ calls." (cl-sort (cl-copy-list packages) #'string-lessp :key #'car) "\n"))))) - (error "Aborted!")) + (user-error "Aborted!")) ((let (success) (doom-refresh-packages-maybe doom-debug-mode) @@ -540,7 +540,7 @@ calls." (package-version-join (cl-caddr pkg)))) packages "\n")))))) - (error "Aborted!")) + (user-error "Aborted!")) ((let (success) (dolist (pkg packages) @@ -583,7 +583,7 @@ calls." (upcase (symbol-name backend)))))) (sort (cl-copy-list packages) #'string-lessp) "\n"))))) - (error "Aborted!")) + (user-error "Aborted!")) ((let (success) (dolist (pkg packages) diff --git a/core/core-cli.el b/core/core-cli.el index d846db0bd..029bec2e2 100644 --- a/core/core-cli.el +++ b/core/core-cli.el @@ -258,7 +258,7 @@ problems with doom." current-rev rev) ;; TODO Display newsletter diff (unless (or doom-auto-accept (y-or-n-p "Proceed?")) - (error "Aborted")) + (user-error "Aborted")) (message "Removing byte-compiled files from your config (if any)") (doom-clean-byte-compiled-files) (unless (zerop (process-file "git" nil buf nil "reset" "--hard"