diff options
| author | Philip Kaludercic <philipk@posteo.net> | 2022-12-25 11:20:30 +0100 |
|---|---|---|
| committer | Philip Kaludercic <philipk@posteo.net> | 2022-12-25 11:21:01 +0100 |
| commit | 940ab2423ca7c7a12aef069804435559d11f68e8 (patch) | |
| tree | de9a407a8dd584ff03944a45762c6de621e656a7 /lisp/emacs-lisp | |
| parent | 9ab98cd42aa7ee7f23f05138beee1f69e7ce5fcc (diff) | |
| download | emacs-940ab2423ca7c7a12aef069804435559d11f68e8.tar.gz emacs-940ab2423ca7c7a12aef069804435559d11f68e8.tar.bz2 emacs-940ab2423ca7c7a12aef069804435559d11f68e8.zip | |
; 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.
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/package-vc.el | 4 |
1 files changed, 3 insertions, 1 deletions
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") |