From e1a2f94ec1534907ee36e9e0e6adc546eea9ae3e Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Mon, 4 Nov 2024 18:21:34 -0500 Subject: [PATCH] fix: void-variable doom-module-load-path error `doom-module-load-path` will be removed in the next big refactor commit, so as a stop gap, I simply move it to doom.el to resolve the reference error. This also removes the obsolete alias `doom-modules-dirs`, since it's been deprecated long enough (and `doom-module-load-path` itself won't be around much longer anyway). Ref: #8147 Amend: 8cafbe4408e7 --- lisp/doom.el | 14 ++++++++++++++ lisp/lib/modules.el | 14 -------------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/lisp/doom.el b/lisp/doom.el index 221bf1832..71ab4fd15 100644 --- a/lisp/doom.el +++ b/lisp/doom.el @@ -257,6 +257,20 @@ Defaults to ~/.config/doom, ~/.doom.d or the value of the DOOMDIR envvar; whichever is found first. Must end in a slash.") +;; DEPRECATED: Will be replaced in v3 +(defvar doom-module-load-path + (list (file-name-concat doom-user-dir "modules") + (file-name-concat doom-emacs-dir "modules")) + "A list of paths where Doom should search for modules. + +Order determines priority (from highest to lowest). + +Each entry is a string; an absolute path to the root directory of a module tree. +In other words, they should contain a two-level nested directory structure, +where the module's group and name was deduced from the first and second level of +directories. For example: if $DOOMDIR/modules/ is an entry, a +$DOOMDIR/modules/lang/ruby/ directory represents a ':lang ruby' module.") + (defvar doom-bin-dir (expand-file-name "bin/" doom-emacs-dir) "Where Doom's executables are stored. diff --git a/lisp/lib/modules.el b/lisp/lib/modules.el index 1a4145db6..5d2b7e011 100644 --- a/lisp/lib/modules.el +++ b/lisp/lib/modules.el @@ -5,20 +5,6 @@ (defvar doom-modules nil "A table of enabled modules and metadata. See `doom-modules-initialize'.") -(define-obsolete-variable-alias 'doom-modules-dirs 'doom-module-load-path "3.0.0") -(defvar doom-module-load-path - (list (file-name-concat doom-user-dir "modules") - (file-name-concat doom-emacs-dir "modules")) - "A list of paths where Doom should search for modules. - -Order determines priority (from highest to lowest). - -Each entry is a string; an absolute path to the root directory of a module tree. -In other words, they should contain a two-level nested directory structure, -where the module's group and name was deduced from the first and second level of -directories. For example: if $DOOMDIR/modules/ is an entry, a -$DOOMDIR/modules/lang/ruby/ directory represents a ':lang ruby' module.") - ;; DEPRECATED: Remove in v3, as it will be handled in the CLI (make-obsolete-variable 'doom-obsolete-modules nil "3.0.0") (defconst doom-obsolete-modules