From: Philip Kaludercic <philipk@posteo.net>
Date: Sun, 25 Dec 2022 10:20:30 +0000 (+0100)
Subject: ; Always consider :lisp-dir when locating main file of VC packages
X-Git-Tag: emacs-29.0.90~993
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=940ab2423ca7c7a12aef069804435559d11f68e8;p=emacs.git

; Always consider :lisp-dir when locating main file of VC packages

* lisp/emacs-lisp/package-vc.el (package-vc--main-file): Check the
:lisp-dir entry in the "extras" of a package description to find the
directory with a main file.
---

diff --git a/lisp/emacs-lisp/package-vc.el b/lisp/emacs-lisp/package-vc.el
index 549b6e95cdb..b01f87d0494 100644
--- a/lisp/emacs-lisp/package-vc.el
+++ b/lisp/emacs-lisp/package-vc.el
@@ -306,7 +306,9 @@ asynchronously."
          (directory (file-name-concat
                      (or (package-desc-dir pkg-desc)
                          (expand-file-name name package-user-dir))
-                     (plist-get pkg-spec :lisp-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)
                    (expand-file-name
                     (concat name ".el")