mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-11-24 07:20:37 +00:00
Avoid reusing :lisp-dir twice in 'package-vc--main-file'
* lisp/emacs-lisp/package-vc.el (package-vc--main-file): Just use :lisp-dir from 'package-desc-extras', not 'pkg-spec'. This avoid appending the contents of :lisp-dir twice, in case it is specified both in pkg-spec and pkg-desc.
This commit is contained in:
parent
068f8fa303
commit
b2ae4e77c7
@ -309,7 +309,6 @@ asynchronously."
|
||||
(directory (file-name-concat
|
||||
(or (package-desc-dir pkg-desc)
|
||||
(expand-file-name name package-user-dir))
|
||||
(plist-get pkg-spec :lisp-dir)
|
||||
(and-let* ((extras (package-desc-extras pkg-desc)))
|
||||
(alist-get :lisp-dir extras))))
|
||||
(file (or (plist-get pkg-spec :main-file)
|
||||
|
Loading…
Reference in New Issue
Block a user