summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp
diff options
context:
space:
mode:
authorPhilip Kaludercic <philipk@posteo.net>2023-02-22 15:28:44 +0100
committerPhilip Kaludercic <philipk@posteo.net>2023-02-24 17:14:19 +0100
commitb2ae4e77c74212b71523625464b7d7e009847420 (patch)
tree683fd023939e18f9cd0e050b04ece9df92c04177 /lisp/emacs-lisp
parent068f8fa3037dfcb7696f1c0e89a622f7fe609994 (diff)
downloademacs-b2ae4e77c74212b71523625464b7d7e009847420.tar.gz
emacs-b2ae4e77c74212b71523625464b7d7e009847420.tar.bz2
emacs-b2ae4e77c74212b71523625464b7d7e009847420.zip
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.
Diffstat (limited to 'lisp/emacs-lisp')
-rw-r--r--lisp/emacs-lisp/package-vc.el1
1 files changed, 0 insertions, 1 deletions
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)