From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 12 Aug 2023 19:50:15 +0000 (-0700)
Subject: Adjust to recent Gnulib changes
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b66c16c789d8046ff40c48b9346b26238b1b97e1;p=emacs.git

Adjust to recent Gnulib changes

The Gnulib regex module now pulls in some wide-char stuff
that I think Emacs doesn’t need.
* admin/merge-gnulib (AVOIDED_MODULES): Add iswblank, iswctype,
iswdigit, iswxdigit, wctype.
---

diff --git a/admin/merge-gnulib b/admin/merge-gnulib
index b533f69cceb..f64c0670bcf 100755
--- a/admin/merge-gnulib
+++ b/admin/merge-gnulib
@@ -52,12 +52,13 @@ GNULIB_MODULES='
 '
 
 AVOIDED_MODULES='
-  btowc chmod close crypto/af_alg dup fchdir fstat langinfo lock
+  btowc chmod close crypto/af_alg dup fchdir fstat
+  iswblank iswctype iswdigit iswxdigit langinfo lock
   mbrtowc mbsinit memchr mkdir msvc-inval msvc-nothrow nl_langinfo
   openat-die opendir pthread-h raise
   save-cwd select setenv sigprocmask stat stdarg
   threadlib tzset unsetenv utime utime-h
-  wchar wcrtomb wctype-h
+  wchar wcrtomb wctype wctype-h
 '
 
 GNULIB_TOOL_FLAGS='