Fix doom-initialize-packages

This commit is contained in:
Henrik Lissner 2018-05-24 21:17:35 +02:00
parent 8282280965
commit 30893b0ff1
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395

View file

@ -316,7 +316,6 @@ them."
;; there's no non-trivial way to detect that, so we give you a way to ;; there's no non-trivial way to detect that, so we give you a way to
;; reload only doom-packages (by passing 'internal as FORCE-P). ;; reload only doom-packages (by passing 'internal as FORCE-P).
;; `doom-packages' ;; `doom-packages'
(when (or force-p (not doom-packages))
(unless (eq force-p 'internal) (unless (eq force-p 'internal)
;; `package-alist' ;; `package-alist'
(when (or force-p (not (bound-and-true-p package-alist))) (when (or force-p (not (bound-and-true-p package-alist)))
@ -326,7 +325,7 @@ them."
package--initialized nil) package--initialized nil)
(let (byte-compile-warnings) (let (byte-compile-warnings)
(condition-case _ (condition-case _
(package-initialize) (quiet! (package-initialize))
('error (package-refresh-contents) ('error (package-refresh-contents)
(setq doom--refreshed-p t) (setq doom--refreshed-p t)
(package-initialize))))) (package-initialize)))))
@ -338,6 +337,7 @@ them."
(or (quelpa-setup-p) (or (quelpa-setup-p)
(error "Could not initialize quelpa")))) (error "Could not initialize quelpa"))))
(when (or force-p (not doom-packages))
(setq doom-packages nil) (setq doom-packages nil)
(cl-flet (cl-flet
((_load ((_load