mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-05 19:31:02 -08:00
Code Issues Projects Releases Wiki Activity

; Fix invalid 'expand-file-name' call from 4226eb2b

Browse source 
* 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.
This commit is contained in:
Philip Kaludercic 2025-05-01 09:49:44 +02:00
parent 1acb645432
commit 15e77fe03a
No known key found for this signature in database
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lisp/emacs-lisp/package-vc.el
View file

@ -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