From 15e77fe03a816e839a6af326cb7837518de0fd23 Mon Sep 17 00:00:00 2001 From: Philip Kaludercic Date: Thu, 1 May 2025 09:49:44 +0200 Subject: [PATCH] ; Fix invalid 'expand-file-name' call from 4226eb2b * lisp/emacs-lisp/package-vc.el (package-vc--main-file) (package-vc--unpack-1): Provide a fallback value if the package specification has no :lisp-dir. --- lisp/emacs-lisp/package-vc.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lisp/emacs-lisp/package-vc.el b/lisp/emacs-lisp/package-vc.el index c1431aa4324..babc0b71524 100644 --- a/lisp/emacs-lisp/package-vc.el +++ b/lisp/emacs-lisp/package-vc.el @@ -244,7 +244,7 @@ asynchronously." (let* ((pkg-spec (package-vc--desc->spec pkg-desc)) (name (symbol-name (package-desc-name pkg-desc))) (directory (expand-file-name - (plist-get pkg-spec :lisp-dir) + (or (plist-get pkg-spec :lisp-dir) ".") (or (package-desc-dir pkg-desc) (expand-file-name name package-user-dir)))) (file (expand-file-name @@ -462,7 +462,7 @@ identify a package as a VC package later on), building documentation and marking the package as installed." (let* ((pkg-spec (package-vc--desc->spec pkg-desc)) (lisp-dir (plist-get pkg-spec :lisp-dir)) - (lisp-path (expand-file-name lisp-dir pkg-dir)) + (lisp-path (expand-file-name (or lisp-dir ".") pkg-dir)) missing) ;; In case the package was installed directly from source, the