[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
emacs-29 940ab2423c 2/2: ; Always consider :lisp-dir when locating main
From: |
Philip Kaludercic |
Subject: |
emacs-29 940ab2423c 2/2: ; Always consider :lisp-dir when locating main file of VC packages |
Date: |
Sun, 25 Dec 2022 05:21:13 -0500 (EST) |
branch: emacs-29
commit 940ab2423ca7c7a12aef069804435559d11f68e8
Author: Philip Kaludercic <philipk@posteo.net>
Commit: Philip Kaludercic <philipk@posteo.net>
; 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.
---
lisp/emacs-lisp/package-vc.el | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/lisp/emacs-lisp/package-vc.el b/lisp/emacs-lisp/package-vc.el
index 549b6e95cd..b01f87d049 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")