Hi Bruno, Thanks for fixing the typo in the other email. I'll remember to use 'foo' instead of "foo". That is a personal habit of mine but I now realize that it goes against all of the existing code...
On 2/24/24 3:42 PM, Bruno Haible wrote: > The sorted(...) instruction is not present in gnulib-tool lines 5647..5652. > Why is it needed? Can you make a quick test with a gnulib-tool invocation > that has several --avoid=... arguments and several module arguments that > are not in increasing alphabetical order? Sure. I'm using the admin/merge-gnulib script from master to test this. Here is the diff with the two sorted instructions removed. diff --git a/gnulib.mk.in.python b/gnulib.mk.in.shell index a86535fd700..a718c17c0e8 100644 --- a/gnulib.mk.in.python +++ b/gnulib.mk.in.shell @@ -1,5 +1,5 @@ ## DO NOT EDIT! GENERATED AUTOMATICALLY! -# Copyright (C) 2024 Free Software Foundation, Inc. +# Copyright (C) 2002-2024 Free Software Foundation, Inc. # # This file is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -173,8 +173,8 @@ # timer-time \ # timespec-add \ # timespec-sub \ -# update-copyright \ # unlocked-io \ +# update-copyright \ # utimensat \ # vla \ # warnings \ Now the diff with the two sorted instructions added again: diff --git a/gnulib.mk.in.python-with-sort b/gnulib.mk.in.shell index 15d15970051..a718c17c0e8 100644 --- a/gnulib.mk.in.python-with-sort +++ b/gnulib.mk.in.shell @@ -1,5 +1,5 @@ ## DO NOT EDIT! GENERATED AUTOMATICALLY! -# Copyright (C) 2024 Free Software Foundation, Inc. +# Copyright (C) 2002-2024 Free Software Foundation, Inc. # # This file is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by So that is the original reason I added the sorted() functions. Unrelated, but gnulib-tool.py does not use a year range for copyright. I'm not sure if it is intentional or not. Anyways, upon further inspection not all of the gnulib-modules are sorted in merge-gnulib. When "unlocked-io" was added to Emacs it was placed after "update-copyright" [1]. I assume that they are sorted somewhere before the actioncmd step in gnulib-tool. Let me experiment with the --avoid modules and I'll reply if I notice anything. [1] https://git.savannah.gnu.org/cgit/emacs.git/tree/admin/merge-gnulib#n50 Collin
