>>>>> On Mon, 22 May 2023 18:53:47 +0300, Eli Zaretskii said: >> Cc: Philip Kaludercic , 63625@debbugs.gnu.org, >> todd smith >> From: Robert Pluim >> Date: Mon, 22 May 2023 17:36:09 +0200 >> Stefan> (package--reload-previously-loaded pkg-desc)) Stefan> (with-demoted-errors "Error loading autoloads: %s" Stefan> (load (package--autoloads-file-name pkg-desc) nil t)) Stefan> - (add-to-list 'load-path (directory-file-name pkg-dir))) Stefan> + ;; FIXME: Since 2013 (commit 4fac34cee97a), the autoload files take Stefan> + ;; care of changing the `load-path', so maybe it's time to Stefan> + ;; remove this fallback code? Stefan> + (unless (or (member (file-name-as-directory pkg-dir) load-path) Stefan> + (member (directory-file-name pkg-dir) load-path)) Stefan> + (add-to-list 'load-path pkg-dir))) >> Stefan> Maybe we can have that patch in emacs-29 and remove the code altogether Stefan> on `master`? >> >> That seems reasonable. Eli? Eli> I'm a bit confused by "that patch" and stuff, and would prefer to see Eli> the patch for emacs-29 and another for master, please. 3 patches, 2 for emacs-29 below. The 3rd one for master is just diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index 2892728ebd9..28bac0401ed 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -902,7 +902,6 @@ package-activate-1 (package--reload-previously-loaded pkg-desc)) (with-demoted-errors "Error loading autoloads: %s" (load (package--autoloads-file-name pkg-desc) nil t)) - (add-to-list 'load-path (directory-file-name pkg-dir))) ;; Add info node. (when (file-exists-p (expand-file-name "dir" pkg-dir)) ;; FIXME: not the friendliest, but simple. Robert --