emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Don't invoke debugger on "Aborted" messages

Browse source
This commit is contained in:
Henrik Lissner 2018-08-02 16:41:19 +02:00
parent 5f1618e7a1
commit 2ee177d588
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
core/autoload/packages.el
View file

@ -483,7 +483,7 @@ calls."
(cl-sort (cl-copy-list packages) #'string-lessp (cl-sort (cl-copy-list packages) #'string-lessp
:key #'car) :key #'car)
"\n"))))) "\n")))))
(error "Aborted!")) (user-error "Aborted!"))
((let (success) ((let (success)
(doom-refresh-packages-maybe doom-debug-mode) (doom-refresh-packages-maybe doom-debug-mode)
@ -540,7 +540,7 @@ calls."
(package-version-join (cl-caddr pkg)))) (package-version-join (cl-caddr pkg))))
packages packages
"\n")))))) "\n"))))))
(error "Aborted!")) (user-error "Aborted!"))
((let (success) ((let (success)
(dolist (pkg packages) (dolist (pkg packages)
@ -583,7 +583,7 @@ calls."
(upcase (symbol-name backend)))))) (upcase (symbol-name backend))))))
(sort (cl-copy-list packages) #'string-lessp) (sort (cl-copy-list packages) #'string-lessp)
"\n"))))) "\n")))))
(error "Aborted!")) (user-error "Aborted!"))
((let (success) ((let (success)
(dolist (pkg packages) (dolist (pkg packages)

2
core/core-cli.el
View file

@ -258,7 +258,7 @@ problems with doom."
current-rev rev) current-rev rev)
;; TODO Display newsletter diff ;; TODO Display newsletter diff
(unless (or doom-auto-accept (y-or-n-p "Proceed?")) (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)") (message "Removing byte-compiled files from your config (if any)")
(doom-clean-byte-compiled-files) (doom-clean-byte-compiled-files)
(unless (zerop (process-file "git" nil buf nil "reset" "--hard" (unless (zerop (process-file "git" nil buf nil "reset" "--hard"