From 64f44c5fa062a3afdcb9dc589e3078211f05e298 Mon Sep 17 00:00:00 2001 From: Philip Kaludercic Date: Wed, 22 Feb 2023 15:28:44 +0100 Subject: [PATCH 2/2] 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. --- lisp/emacs-lisp/package-vc.el | 1 - 1 file changed, 1 deletion(-) 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 @@ package-vc--main-file (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) -- 2.30.2