emacs-29 6f6071c5261 1/2: Avoid duplicate load-path entry when generating package autoloads

[Robert Pluim]

branch: emacs-29
commit 6f6071c52616cc30bc28083688a3ad8d70ce713e
Author: Robert Pluim <rpluim@gmail.com>
Commit: Robert Pluim <rpluim@gmail.com>

    Avoid duplicate load-path entry when generating package autoloads
    
    'file-name-directory' produces a path ending in '/', so that needs to be
    run through 'directory-file-name' to avoid duplicate entries in
    'load-path'.  (Bug#63625)
    
    * lisp/emacs-lisp/package.el (package-generate-autoloads): Call
    'directory-file-name' on the directory of 'load-file-name'.
---
 lisp/emacs-lisp/package.el | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index 293c1c39ca1..0d90e4a4059 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -1110,8 +1110,12 @@ untar into a directory named DIR; otherwise, signal an 
error."
         ;; Add the directory that will contain the autoload file to
         ;; the load path.  We don't hard-code `pkg-dir', to avoid
         ;; issues if the package directory is moved around.
-        (or (and load-file-name (file-name-directory load-file-name))
-            (car load-path)))))
+        ;; `loaddefs-generate' has code to do this for us, but it's
+        ;; not currently exposed.  (Bug#63625)
+        (or (and load-file-name
+                 (directory-file-name
+                  (file-name-directory load-file-name)))
+             (car load-path)))))
     (let ((buf (find-buffer-visiting output-file)))
       (when buf (kill-buffer buf)))
     auto-name))