diff --git a/core/autoload/debug.el b/core/autoload/debug.el index a0b370c0c..c34798546 100644 --- a/core/autoload/debug.el +++ b/core/autoload/debug.el @@ -80,14 +80,18 @@ ready to be pasted in a bug report on github." '("n/a"))) (packages ,@(or (ignore-errors - (cl-loop for (name . plist) in (doom-package-list) - if (doom-package-private-p name) - collect - (format - "%s" (if-let (splist (doom-plist-delete (copy-sequence plist) - :modules)) - (cons name splist) - name)))) + (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) + collect + (if-let (splist (doom-plist-delete (copy-sequence plist) + :modules)) + (prin1-to-string (cons name splist)) + name)))) '("n/a"))) (elpa ,@(or (ignore-errors diff --git a/core/autoload/packages.el b/core/autoload/packages.el index 66d16a6ac..bdf655d08 100644 --- a/core/autoload/packages.el +++ b/core/autoload/packages.el @@ -131,10 +131,10 @@ was installed with." ;; ;;; Package list getters -(defun doom--read-module-packages-file (file &optional eval noerror) +(defun doom--read-module-packages-file (file &optional noeval noerror) (with-temp-buffer ; prevent buffer-local settings from propagating (condition-case e - (if (not eval) + (if (not noeval) (load file noerror t t) (when (file-readable-p file) (insert-file-contents file)