From c80fa2efdf3c1ad4fbaea8201c0cd4a90e4c5744 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sat, 10 Sep 2022 20:00:12 +0200 Subject: [PATCH] fix: all packages seen as disabled In v3, doom-module data is stored in symbol plists, but in v2, it's stored in a hash table. Some v3 code snuck into 45a66cd, which made Doom try to read module data from plists that hadn't been initialized yet, so Doom could no longer see your module settings. Fix: #6769 Amend: 45a66cda6060 --- lisp/doom-packages.el | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/lisp/doom-packages.el b/lisp/doom-packages.el index a030b5629..331449cd7 100644 --- a/lisp/doom-packages.el +++ b/lisp/doom-packages.el @@ -463,11 +463,10 @@ ones." (let (doom-packages) (doom--read-packages private-packages nil 'noerror)) (cl-loop for key being the hash-keys of doom-modules - for plist = (get (car key) (cdr key)) - for doom--current-flags = (plist-get plist :flags) + for path = (doom-module-path (car key) (cdr key) packages-file) for doom--current-module = key - for file = (doom-path (plist-get plist :path) packages-file) - do (doom--read-packages file nil 'noerror))) + for doom--current-flags = (doom-module-get (car key) (cdr key) :flags) + do (doom--read-packages path nil 'noerror))) (doom--read-packages private-packages all-p 'noerror))) (cl-remove-if-not (if core-only-p