emacs-29 b2ae4e77c74 2/2: Avoid reusing :lisp-dir twice in 'package-vc--main-file'

[Philip Kaludercic]

branch: emacs-29
commit b2ae4e77c74212b71523625464b7d7e009847420
Author: Philip Kaludercic <philipk@posteo.net>
Commit: Philip Kaludercic <philipk@posteo.net>

    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.
---
 lisp/emacs-lisp/package-vc.el | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lisp/emacs-lisp/package-vc.el b/lisp/emacs-lisp/package-vc.el
index b22823fd706..ea2766b8dc4 100644
--- a/lisp/emacs-lisp/package-vc.el
+++ b/lisp/emacs-lisp/package-vc.el
@@ -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)