Fix 'doom compile'

Fixes `void-function define-key!` error.
This commit is contained in:
Henrik Lissner 2019-08-15 01:31:22 -04:00
parent 374940b959
commit b29a7ba8fe
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
2 changed files with 16 additions and 17 deletions

View file

@ -92,8 +92,8 @@ If RECOMPILE-P is non-nil, only recompile out-of-date files."
;; But first we must be sure that Doom and your private config have been
;; fully loaded. Which usually aren't so in an noninteractive session.
(doom-load-autoloads-file doom-autoload-file)
(doom-load-autoloads-file doom-package-autoload-file)
(let (noninteractive)
(doom-initialize 'force-p))
;;
(unless target-dirs
@ -103,7 +103,7 @@ If RECOMPILE-P is non-nil, only recompile out-of-date files."
(list doom-core-dir)
;; Omit `doom-private-dir', which is always first
(cl-remove-if-not (lambda (path) (file-in-directory-p path doom-emacs-dir))
(cdr (doom-module-load-path)))))
(nreverse (cdr (doom-module-load-path))))))
;; Assemble el files we want to compile; taking into account that MODULES
;; may be a list of MODULE/SUBMODULE strings from the command line.

View file

@ -521,17 +521,11 @@ to least)."
(user-error "Run `bin/doom refresh' to generate them")))
;; Load shell environment, optionally generated from 'doom env'
(unless noninteractive
(when (file-exists-p doom-env-file)
(doom-load-envvars-file doom-env-file)))))
;;
;;; Bootstrap Doom
(doom-initialize noninteractive)
(if noninteractive
(require 'core-cli)
(when (file-exists-p doom-env-file)
(doom-load-envvars-file doom-env-file))
(add-hook 'window-setup-hook #'doom-display-benchmark-h)
(require 'core-keybinds)
(require 'core-ui)
@ -540,8 +534,13 @@ to least)."
(when (cdr command-line-args)
(add-to-list 'command-switch-alist
(cons "--restore" #'doom-restore-session-handler))))
(cons "--restore" #'doom-restore-session-handler))))))
;;
;;; Bootstrap Doom
(doom-initialize noninteractive)
(doom-initialize-modules)
(provide 'core)