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

Fix 'doom run' #1724

Browse source
This commit is contained in:
Henrik Lissner 2019-08-28 20:13:45 -04:00
parent f90cf1f974
commit 081f09aac8
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 38 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

12
bin/doom
View file

@ -81,15 +81,17 @@
(error "%s does not exist" user-emacs-directory)) (error "%s does not exist" user-emacs-directory))
;; Bootstrap Doom ;; Bootstrap Doom
(if (not noninteractive)
(progn
(load (expand-file-name "init.el" user-emacs-directory)
nil 'nomessage)
(doom-run-all-startup-hooks-h))
(load (expand-file-name "core/core.el" user-emacs-directory) (load (expand-file-name "core/core.el" user-emacs-directory)
nil 'nomessage) nil 'nomessage)
(doom-initialize 'force-p) (doom-initialize 'force-p)
(doom-initialize-modules) (doom-initialize-modules)
(cond ((not noninteractive) (cond ((and (not (cdr args))
(doom-run-all-startup-hooks-h))
((and (not (cdr args))
(member (car args) '("help" "h"))) (member (car args) '("help" "h")))
(usage)) (usage))
((not args) ((not args)
@ -117,4 +119,4 @@
"Emacs outputs to standard error, so you'll need to redirect stderr to\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" "stdout to pipe this to a file or clipboard!\n\n"
" e.g. doom -d install 2>&1 | clipboard-program")) " e.g. doom -d install 2>&1 | clipboard-program"))
(signal 'doom-error e)))))))) (signal 'doom-error e)))))))))