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 b533f69ccebe49a2c962d035aa3c40557190607e..f64c0670bcf786bb323725bbca1c549ee4761575 100755 (executable)
--- 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='