From f2f583bfb78062041378c8cddd7e1661be64095a Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Wed, 6 Apr 2022 23:06:32 +0200 Subject: [PATCH] fix: :load-path throwing error in org-src blocks Because src blocks don't provide a valid load-file-name or buffer-file-name, dir! cannot resolve the current file's path. Fix: #6241 --- core/core-modules.el | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/core/core-modules.el b/core/core-modules.el index fc6626301..e0ce97e54 100644 --- a/core/core-modules.el +++ b/core/core-modules.el @@ -373,7 +373,11 @@ This value is cached. If REFRESH-P, then don't use the cached value." :around #'use-package-normalize-paths ;; `use-package-normalize-paths' resolves paths relative to ;; `user-emacs-directory', so we change that. - (let ((user-emacs-directory (if (stringp arg) (dir!)))) + (let ((user-emacs-directory + (or (and (stringp arg) + (not (file-name-absolute-p arg)) + (ignore-errors (dir!))) + user-emacs-directory))) (funcall fn label arg recursed))) ;; Adds two keywords to `use-package' to expand its lazy-loading capabilities: