]> git.eshelyaron.com Git - emacs.git/commit
Update from Gnulib by running admin/merge-gnulib
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 8 May 2025 06:57:18 +0000 (23:57 -0700)
committerEshel Yaron <me@eshelyaron.com>
Sat, 10 May 2025 08:54:54 +0000 (10:54 +0200)
commitaf45963bee084cbc1dc56018b1e3ef54d9479b1f
tree62d2e6bbd85649aecee2083a34da81136be0f999
parent126eda8b301574e39520317042be3cfb88cf523a
Update from Gnulib by running admin/merge-gnulib

The following changes were made by hand,
so that admin/merge-gnulib could succeed
instead of failing because the diff didn’t match.
* admin/gnulib-patches/lib/getloadavg.c.diff:
Remove, as it is no longer needed now that recent
Gnulib has been merged.
* admin/merge-gnulib (GNULIB_TOOL_FLAGS):
Remove the --local-dir="$src"admin/gnulib-patches option,
as it is no longer needed either.

(cherry picked from commit c9c6abfa81c58b4a62f4fa5fcaad94b219f5d706)
14 files changed:
admin/gnulib-patches/lib/getloadavg.c.diff [deleted file]
admin/merge-gnulib
lib/attribute.h
lib/cdefs.h
lib/diffseq.h
lib/getloadavg.c
lib/gnulib.mk.in
lib/stddef.in.h
lib/stdlib.in.h
lib/string.in.h
lib/utimensat.c
m4/gnulib-common.m4
m4/manywarnings.m4
m4/stddef_h.m4