From: Philip Kaludercic <philipk@posteo.net>
Date: Wed, 22 Feb 2023 14:28:44 +0000 (+0100)
Subject: Avoid reusing :lisp-dir twice in 'package-vc--main-file'
X-Git-Tag: emacs-29.0.90~331
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b2ae4e77c74212b71523625464b7d7e009847420;p=emacs.git

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

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)