From 68b5f687bd2b09774fd0ed877efc319a21760631 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Thu, 14 May 2020 16:33:03 -0400 Subject: [PATCH] doom/doctor: fix 'org not installed' error Also indents missing package warnings correctly and makes them harder to mistake for system packages. Fixes #2284 --- core/cli/doctor.el | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/core/cli/doctor.el b/core/cli/doctor.el index bcc02fa43..224562263 100644 --- a/core/cli/doctor.el +++ b/core/cli/doctor.el @@ -157,15 +157,17 @@ in." (condition-case-unless-debug ex (let ((doctor-file (doom-module-path (car key) (cdr key) "doctor.el")) (packages-file (doom-module-path (car key) (cdr key) "packages.el"))) - (cl-loop for name in (let (doom-packages + (cl-loop with doom-format-indent = 6 + for name in (let (doom-packages doom-disabled-packages) (load packages-file 'noerror 'nomessage) (mapcar #'car doom-packages)) unless (or (doom-package-get name :disable) (eval (doom-package-get name :ignore)) + (plist-get (doom-package-get name :recipe) :local-repo) (doom-package-built-in-p name) (doom-package-installed-p name)) - do (print! (error "%s is not installed") name)) + do (print! (error "Missing emacs package: %S") name)) (let ((inhibit-message t)) (load doctor-file 'noerror 'nomessage))) (file-missing (error! "%s" (error-message-string ex)))