merge trunk

2 files changed, 8 insertions, 1 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index c579930d2bf..ea977e80cfa 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,10 @@
+2012-08-16  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Use ASCII tests for character types.
+        * merge-gnulib (GNULIB_MODULES): Add c-ctype.  This documents a
+        new direct dependency; c-ctype was already being used indirectly
+        via other gnulib modules.
+
 2012-08-14  Paul Eggert  <eggert@cs.ucla.edu>
 
         Use bool for Emacs Lisp booleans.
diff --git a/admin/merge-gnulib b/admin/merge-gnulib
index c5b9eba5ee6..63865edf3ce 100755
--- a/admin/merge-gnulib
+++ b/admin/merge-gnulib
@@ -26,7 +26,7 @@
 GNULIB_URL=git://git.savannah.gnu.org/gnulib.git
 
 GNULIB_MODULES='
-  alloca-opt c-strcase
+  alloca-opt c-ctype c-strcase
   careadlinkat crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512
   dtoastr dtotimespec dup2 environ
   filemode getloadavg getopt-gnu gettime gettimeofday