From e623fde85a41cb2447e479289377cd971885bae9 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sat, 14 Dec 2019 18:23:30 -0500 Subject: [PATCH] Fix private & elpa package lists in doom/info And display errors if something went wrong. --- core/autoload/debug.el | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/core/autoload/debug.el b/core/autoload/debug.el index 43ea2444c..b6d70d421 100644 --- a/core/autoload/debug.el +++ b/core/autoload/debug.el @@ -78,24 +78,24 @@ ready to be pasted in a bug report on github." (cdr key)))) '("n/a"))) (packages - ,@(or (ignore-errors - (let ((doom-interactive-mode t) - doom-packages - doom-disabled-packages) - (doom--read-module-packages-file - (doom-path doom-private-dir "packages.el") - nil t) - (cl-loop for (name . plist) in (nreverse doom-packages) + ,@(or (condition-case e + (cl-loop for (name . plist) in (doom-package-list) + if (cl-find :private (plist-get plist :modules) + :key #'car) collect (if-let (splist (doom-plist-delete (copy-sequence plist) :modules)) (prin1-to-string (cons name splist)) - name)))) + name)) + (error (format "<%S>" e))) '("n/a"))) (elpa - ,@(or (ignore-errors - (cl-loop for (name . _) in package-alist - collect (format "%s" name))) + ,@(or (condition-case e + (progn + (package-initialize) + (cl-loop for (name . _) in package-alist + collect (format "%s" name))) + (error (format "<%S>" e))) '("n/a"))))))))