summaryrefslogtreecommitdiff
path: root/admin
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2025-04-19 12:15:51 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2025-04-19 19:31:25 -0700
commit30335bb73483fce9d4204f1e18618fe777d0f45e (patch)
tree7dff4bb750a20fcdab6ebfbb11cb57822c3e11db /admin
parent4fa10b5760c7ded3cc18d0da614a5f0cd38edfef (diff)
Don’t use Gnulib’s locale-h module
* admin/merge-gnulib (AVOIDED_MODULES): Add locale-h, as Emacs should’t need this Gnulib module. This change is needed for when we next run admin/merge-gnulib, as some Gnulib dependencies changed recently.
Diffstat (limited to 'admin')
-rwxr-xr-xadmin/merge-gnulib2
1 files changed, 1 insertions, 1 deletions
diff --git a/admin/merge-gnulib b/admin/merge-gnulib
index ae433961df3..54dcf275d55 100755
--- a/admin/merge-gnulib
+++ b/admin/merge-gnulib
@@ -58,7 +58,7 @@ GNULIB_MODULES='
AVOIDED_MODULES='
access btowc chmod close crypto/af_alg dup fchdir fstat gnulib-i18n
iswblank iswctype iswdigit iswxdigit langinfo-h libgmp-mpq
- localename-unsafe-limited lock
+ locale-h localename-unsafe-limited lock
mbrtowc mbsinit memchr mkdir msvc-inval msvc-nothrow nl_langinfo
openat-die opendir pthread-h raise
save-cwd select setenv sigprocmask stat stdarg-h