diff --git a/core/core-modules.el b/core/core-modules.el index 5448ccc87..056a2d672 100644 --- a/core/core-modules.el +++ b/core/core-modules.el @@ -357,15 +357,16 @@ This value is cached. If REFRESH-P, then don't use the cached value." ;; HACK Fix `:load-path' so it resolves relative paths to the containing file, ;; rather than `user-emacs-directory'. This is a done as a convenience ;; for users, wanting to specify a local directory. - (defadvice! doom--resolve-load-path-from-containg-file-a (orig-fn _label arg &optional _recursed) + (defadvice! doom--resolve-load-path-from-containg-file-a (orig-fn &rest args) "Resolve :load-path from the current directory." :around #'use-package-normalize-paths - (if (and (stringp arg) (not (file-name-absolute-p arg))) - ;; `use-package-normalize-paths' resolves relative paths from - ;; `user-emacs-directory', so just change that. - (let ((user-emacs-directory (dir!))) - (funcall orig-fn args)) - (funcall orig-fn args))) + (let ((arg (cadr args))) + (if (and (stringp arg) (not (file-name-absolute-p arg))) + ;; `use-package-normalize-paths' resolves relative paths from + ;; `user-emacs-directory', so just change that. + (let ((user-emacs-directory (dir!))) + (apply orig-fn args)) + (apply orig-fn args)))) ;; Adds two keywords to `use-package' to expand its lazy-loading capabilities: ;;