emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

emacs-29 6c86faec29: loaddefs-gen: Group results by absolute file name


From: Eli Zaretskii
Subject: emacs-29 6c86faec29: loaddefs-gen: Group results by absolute file name
Date: Mon, 26 Dec 2022 07:56:49 -0500 (EST)

branch: emacs-29
commit 6c86faec29e7e9f12b71886dc66b62e1da43cdf7
Author: Kyle Meyer <kyle@kyleam.com>
Commit: Eli Zaretskii <eliz@gnu.org>

    loaddefs-gen: Group results by absolute file name
    
    loaddefs-generate produced an incomplete output file if 1) it
    was called with a relative file name and 2) that same file was
    specified via a generated-autoload-file cookie in a subset of
    the input files.  In that case, autoload entries were lost
    because loaddefs-generate writes the same output file twice:
    once for the relative name specified by the caller and once
    for the absolute name that loaddefs-generate--parse-file
    returns for the generated-autoload-file value.
    This has been fixed.  (Bug#60318)
    
    * lisp/emacs-lisp/loaddefs-gen.el (loaddefs-generate): Expand file
    names when grouping loaddef files.
---
 lisp/emacs-lisp/loaddefs-gen.el | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lisp/emacs-lisp/loaddefs-gen.el b/lisp/emacs-lisp/loaddefs-gen.el
index 2dd04174f5..460d8eca58 100644
--- a/lisp/emacs-lisp/loaddefs-gen.el
+++ b/lisp/emacs-lisp/loaddefs-gen.el
@@ -608,7 +608,8 @@ instead of just updating them with the new/changed 
autoloads."
           (write-region (point-min) (point-max) output-file nil 'silent))
       ;; We have some data, so generate the loaddef files.  First
       ;; group per output file.
-      (dolist (fdefs (seq-group-by #'car defs))
+      (dolist (fdefs (seq-group-by (lambda (x) (expand-file-name (car x)))
+                                   defs))
         (let ((loaddefs-file (car fdefs))
               hash)
           (with-temp-buffer



reply via email to

[Prev in Thread] Current Thread [Next in Thread]