12 files changed, 397 insertions, 59 deletions

diff --git a/autogen/Makefile.in b/autogen/Makefile.in
index 4e4fd344672..743dd02917d 100644
--- a/autogen/Makefile.in
+++ b/autogen/Makefile.in
@@ -17,14 +17,26 @@
 
 # Copyright (C) 2002-2011 Free Software Foundation, Inc.
 #
-# This file is free software, distributed under the terms of the GNU
-# General Public License.  As a special exception to the GNU General
-# Public License, this file may be distributed as part of a program
-# that contains a configuration script generated by Autoconf, under
+# This file is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This file is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this file.  If not, see <http://www.gnu.org/licenses/>.
+#
+# As a special exception to the GNU General Public License,
+# this file may be distributed as part of a program that
+# contains a configuration script generated by Autoconf, under
 # the same distribution terms as the rest of that program.
 #
 # Generated by gnulib-tool.
-# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --avoid=threadlib --makefile-name=gnulib.mk --conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files alloca-opt careadlinkat crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 dtoastr dup2 filemode getloadavg getopt-gnu ignore-value intprops lstat mktime pthread_sigmask readlink socklen stdarg stdio strftime strtoimax strtoumax symlink sys_stat
+# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --avoid=msvc-inval --avoid=msvc-nothrow --avoid=pathmax --avoid=raise --avoid=threadlib --makefile-name=gnulib.mk --conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files alloca-opt careadlinkat crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 dtoastr dup2 filemode getloadavg getopt-gnu ignore-value intprops lstat mktime pthread_sigmask readlink socklen stdarg stdio strftime strtoimax strtoumax symlink sys_stat
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
@@ -167,9 +179,11 @@ GMALLOC_OBJ = @GMALLOC_OBJ@
 GNULIB_ATOLL = @GNULIB_ATOLL@
 GNULIB_CALLOC_POSIX = @GNULIB_CALLOC_POSIX@
 GNULIB_CANONICALIZE_FILE_NAME = @GNULIB_CANONICALIZE_FILE_NAME@
+GNULIB_CHDIR = @GNULIB_CHDIR@
 GNULIB_CHOWN = @GNULIB_CHOWN@
 GNULIB_CLOSE = @GNULIB_CLOSE@
 GNULIB_DPRINTF = @GNULIB_DPRINTF@
+GNULIB_DUP = @GNULIB_DUP@
 GNULIB_DUP2 = @GNULIB_DUP2@
 GNULIB_DUP3 = @GNULIB_DUP3@
 GNULIB_ENVIRON = @GNULIB_ENVIRON@
@@ -179,6 +193,8 @@ GNULIB_FCHDIR = @GNULIB_FCHDIR@
 GNULIB_FCHMODAT = @GNULIB_FCHMODAT@
 GNULIB_FCHOWNAT = @GNULIB_FCHOWNAT@
 GNULIB_FCLOSE = @GNULIB_FCLOSE@
+GNULIB_FDATASYNC = @GNULIB_FDATASYNC@
+GNULIB_FDOPEN = @GNULIB_FDOPEN@
 GNULIB_FFLUSH = @GNULIB_FFLUSH@
 GNULIB_FGETC = @GNULIB_FGETC@
 GNULIB_FGETS = @GNULIB_FGETS@
@@ -193,6 +209,7 @@ GNULIB_FREOPEN = @GNULIB_FREOPEN@
 GNULIB_FSCANF = @GNULIB_FSCANF@
 GNULIB_FSEEK = @GNULIB_FSEEK@
 GNULIB_FSEEKO = @GNULIB_FSEEKO@
+GNULIB_FSTAT = @GNULIB_FSTAT@
 GNULIB_FSTATAT = @GNULIB_FSTATAT@
 GNULIB_FSYNC = @GNULIB_FSYNC@
 GNULIB_FTELL = @GNULIB_FTELL@
@@ -242,6 +259,7 @@ GNULIB_MKTIME = @GNULIB_MKTIME@
 GNULIB_NANOSLEEP = @GNULIB_NANOSLEEP@
 GNULIB_OBSTACK_PRINTF = @GNULIB_OBSTACK_PRINTF@
 GNULIB_OBSTACK_PRINTF_POSIX = @GNULIB_OBSTACK_PRINTF_POSIX@
+GNULIB_PCLOSE = @GNULIB_PCLOSE@
 GNULIB_PERROR = @GNULIB_PERROR@
 GNULIB_PIPE = @GNULIB_PIPE@
 GNULIB_PIPE2 = @GNULIB_PIPE2@
@@ -256,6 +274,7 @@ GNULIB_PUTCHAR = @GNULIB_PUTCHAR@
 GNULIB_PUTENV = @GNULIB_PUTENV@
 GNULIB_PUTS = @GNULIB_PUTS@
 GNULIB_PWRITE = @GNULIB_PWRITE@
+GNULIB_RAISE = @GNULIB_RAISE@
 GNULIB_RANDOM_R = @GNULIB_RANDOM_R@
 GNULIB_READ = @GNULIB_READ@
 GNULIB_READLINK = @GNULIB_READLINK@
@@ -327,6 +346,7 @@ HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@
 HAVE_CHOWN = @HAVE_CHOWN@
 HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@
 HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@
+HAVE_DECL_FDATASYNC = @HAVE_DECL_FDATASYNC@
 HAVE_DECL_FPURGE = @HAVE_DECL_FPURGE@
 HAVE_DECL_FSEEKO = @HAVE_DECL_FSEEKO@
 HAVE_DECL_FTELLO = @HAVE_DECL_FTELLO@
@@ -356,6 +376,7 @@ HAVE_FACCESSAT = @HAVE_FACCESSAT@
 HAVE_FCHDIR = @HAVE_FCHDIR@
 HAVE_FCHMODAT = @HAVE_FCHMODAT@
 HAVE_FCHOWNAT = @HAVE_FCHOWNAT@
+HAVE_FDATASYNC = @HAVE_FDATASYNC@
 HAVE_FSEEKO = @HAVE_FSEEKO@
 HAVE_FSTATAT = @HAVE_FSTATAT@
 HAVE_FSYNC = @HAVE_FSYNC@
@@ -391,13 +412,16 @@ HAVE_MKSTEMP = @HAVE_MKSTEMP@
 HAVE_MKSTEMPS = @HAVE_MKSTEMPS@
 HAVE_NANOSLEEP = @HAVE_NANOSLEEP@
 HAVE_OS_H = @HAVE_OS_H@
+HAVE_PCLOSE = @HAVE_PCLOSE@
 HAVE_PIPE = @HAVE_PIPE@
 HAVE_PIPE2 = @HAVE_PIPE2@
+HAVE_POPEN = @HAVE_POPEN@
 HAVE_POSIX_SIGNALBLOCKING = @HAVE_POSIX_SIGNALBLOCKING@
 HAVE_PREAD = @HAVE_PREAD@
 HAVE_PTHREAD_SIGMASK = @HAVE_PTHREAD_SIGMASK@
 HAVE_PTSNAME = @HAVE_PTSNAME@
 HAVE_PWRITE = @HAVE_PWRITE@
+HAVE_RAISE = @HAVE_RAISE@
 HAVE_RANDOM_H = @HAVE_RANDOM_H@
 HAVE_RANDOM_R = @HAVE_RANDOM_R@
 HAVE_READLINK = @HAVE_READLINK@
@@ -566,6 +590,7 @@ REPLACE_DUP = @REPLACE_DUP@
 REPLACE_DUP2 = @REPLACE_DUP2@
 REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@
 REPLACE_FCLOSE = @REPLACE_FCLOSE@
+REPLACE_FDOPEN = @REPLACE_FDOPEN@
 REPLACE_FFLUSH = @REPLACE_FFLUSH@
 REPLACE_FOPEN = @REPLACE_FOPEN@
 REPLACE_FPRINTF = @REPLACE_FPRINTF@
@@ -608,6 +633,7 @@ REPLACE_PRINTF = @REPLACE_PRINTF@
 REPLACE_PTHREAD_SIGMASK = @REPLACE_PTHREAD_SIGMASK@
 REPLACE_PUTENV = @REPLACE_PUTENV@
 REPLACE_PWRITE = @REPLACE_PWRITE@
+REPLACE_RAISE = @REPLACE_RAISE@
 REPLACE_READ = @REPLACE_READ@
 REPLACE_READLINK = @REPLACE_READLINK@
 REPLACE_REALLOC = @REPLACE_REALLOC@
@@ -1169,11 +1195,13 @@ signal.h: signal.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
               -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
               -e 's|@''NEXT_SIGNAL_H''@|$(NEXT_SIGNAL_H)|g' \
               -e 's|@''GNULIB_PTHREAD_SIGMASK''@|$(GNULIB_PTHREAD_SIGMASK)|g' \
+              -e 's|@''GNULIB_RAISE''@|$(GNULIB_RAISE)|g' \
               -e 's/@''GNULIB_SIGNAL_H_SIGPIPE''@/$(GNULIB_SIGNAL_H_SIGPIPE)/g' \
               -e 's/@''GNULIB_SIGPROCMASK''@/$(GNULIB_SIGPROCMASK)/g' \
               -e 's/@''GNULIB_SIGACTION''@/$(GNULIB_SIGACTION)/g' \
               -e 's|@''HAVE_POSIX_SIGNALBLOCKING''@|$(HAVE_POSIX_SIGNALBLOCKING)|g' \
               -e 's|@''HAVE_PTHREAD_SIGMASK''@|$(HAVE_PTHREAD_SIGMASK)|g' \
+              -e 's|@''HAVE_RAISE''@|$(HAVE_RAISE)|g' \
               -e 's|@''HAVE_SIGSET_T''@|$(HAVE_SIGSET_T)|g' \
               -e 's|@''HAVE_SIGINFO_T''@|$(HAVE_SIGINFO_T)|g' \
               -e 's|@''HAVE_SIGACTION''@|$(HAVE_SIGACTION)|g' \
@@ -1181,6 +1209,7 @@ signal.h: signal.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
               -e 's|@''HAVE_TYPE_VOLATILE_SIG_ATOMIC_T''@|$(HAVE_TYPE_VOLATILE_SIG_ATOMIC_T)|g' \
               -e 's|@''HAVE_SIGHANDLER_T''@|$(HAVE_SIGHANDLER_T)|g' \
               -e 's|@''REPLACE_PTHREAD_SIGMASK''@|$(REPLACE_PTHREAD_SIGMASK)|g' \
+              -e 's|@''REPLACE_RAISE''@|$(REPLACE_RAISE)|g' \
               -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
               -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
               -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
@@ -1309,6 +1338,7 @@ stdio.h: stdio.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H)
               -e 's|@''NEXT_STDIO_H''@|$(NEXT_STDIO_H)|g' \
               -e 's/@''GNULIB_DPRINTF''@/$(GNULIB_DPRINTF)/g' \
               -e 's/@''GNULIB_FCLOSE''@/$(GNULIB_FCLOSE)/g' \
+              -e 's/@''GNULIB_FDOPEN''@/$(GNULIB_FDOPEN)/g' \
               -e 's/@''GNULIB_FFLUSH''@/$(GNULIB_FFLUSH)/g' \
               -e 's/@''GNULIB_FGETC''@/$(GNULIB_FGETC)/g' \
               -e 's/@''GNULIB_FGETS''@/$(GNULIB_FGETS)/g' \
@@ -1333,6 +1363,7 @@ stdio.h: stdio.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H)
               -e 's/@''GNULIB_GETS''@/$(GNULIB_GETS)/g' \
               -e 's/@''GNULIB_OBSTACK_PRINTF''@/$(GNULIB_OBSTACK_PRINTF)/g' \
               -e 's/@''GNULIB_OBSTACK_PRINTF_POSIX''@/$(GNULIB_OBSTACK_PRINTF_POSIX)/g' \
+              -e 's/@''GNULIB_PCLOSE''@/$(GNULIB_PCLOSE)/g' \
               -e 's/@''GNULIB_PERROR''@/$(GNULIB_PERROR)/g' \
               -e 's/@''GNULIB_POPEN''@/$(GNULIB_POPEN)/g' \
               -e 's/@''GNULIB_PRINTF''@/$(GNULIB_PRINTF)/g' \
@@ -1371,11 +1402,14 @@ stdio.h: stdio.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H)
               -e 's|@''HAVE_DPRINTF''@|$(HAVE_DPRINTF)|g' \
               -e 's|@''HAVE_FSEEKO''@|$(HAVE_FSEEKO)|g' \
               -e 's|@''HAVE_FTELLO''@|$(HAVE_FTELLO)|g' \
+              -e 's|@''HAVE_PCLOSE''@|$(HAVE_PCLOSE)|g' \
+              -e 's|@''HAVE_POPEN''@|$(HAVE_POPEN)|g' \
               -e 's|@''HAVE_RENAMEAT''@|$(HAVE_RENAMEAT)|g' \
               -e 's|@''HAVE_VASPRINTF''@|$(HAVE_VASPRINTF)|g' \
               -e 's|@''HAVE_VDPRINTF''@|$(HAVE_VDPRINTF)|g' \
               -e 's|@''REPLACE_DPRINTF''@|$(REPLACE_DPRINTF)|g' \
               -e 's|@''REPLACE_FCLOSE''@|$(REPLACE_FCLOSE)|g' \
+              -e 's|@''REPLACE_FDOPEN''@|$(REPLACE_FDOPEN)|g' \
               -e 's|@''REPLACE_FFLUSH''@|$(REPLACE_FFLUSH)|g' \
               -e 's|@''REPLACE_FOPEN''@|$(REPLACE_FOPEN)|g' \
               -e 's|@''REPLACE_FPRINTF''@|$(REPLACE_FPRINTF)|g' \
@@ -1507,6 +1541,7 @@ sys/stat.h: sys_stat.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNU
               -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
               -e 's|@''NEXT_SYS_STAT_H''@|$(NEXT_SYS_STAT_H)|g' \
               -e 's/@''GNULIB_FCHMODAT''@/$(GNULIB_FCHMODAT)/g' \
+              -e 's/@''GNULIB_FSTAT''@/$(GNULIB_FSTAT)/g' \
               -e 's/@''GNULIB_FSTATAT''@/$(GNULIB_FSTATAT)/g' \
               -e 's/@''GNULIB_FUTIMENS''@/$(GNULIB_FUTIMENS)/g' \
               -e 's/@''GNULIB_LCHMOD''@/$(GNULIB_LCHMOD)/g' \
@@ -1589,8 +1624,10 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
               -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
               -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
               -e 's|@''NEXT_UNISTD_H''@|$(NEXT_UNISTD_H)|g' \
+              -e 's/@''GNULIB_CHDIR''@/$(GNULIB_CHDIR)/g' \
               -e 's/@''GNULIB_CHOWN''@/$(GNULIB_CHOWN)/g' \
               -e 's/@''GNULIB_CLOSE''@/$(GNULIB_CLOSE)/g' \
+              -e 's/@''GNULIB_DUP''@/$(GNULIB_DUP)/g' \
               -e 's/@''GNULIB_DUP2''@/$(GNULIB_DUP2)/g' \
               -e 's/@''GNULIB_DUP3''@/$(GNULIB_DUP3)/g' \
               -e 's/@''GNULIB_ENVIRON''@/$(GNULIB_ENVIRON)/g' \
@@ -1598,6 +1635,7 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
               -e 's/@''GNULIB_FACCESSAT''@/$(GNULIB_FACCESSAT)/g' \
               -e 's/@''GNULIB_FCHDIR''@/$(GNULIB_FCHDIR)/g' \
               -e 's/@''GNULIB_FCHOWNAT''@/$(GNULIB_FCHOWNAT)/g' \
+              -e 's/@''GNULIB_FDATASYNC''@/$(GNULIB_FDATASYNC)/g' \
               -e 's/@''GNULIB_FSYNC''@/$(GNULIB_FSYNC)/g' \
               -e 's/@''GNULIB_FTRUNCATE''@/$(GNULIB_FTRUNCATE)/g' \
               -e 's/@''GNULIB_GETCWD''@/$(GNULIB_GETCWD)/g' \
@@ -1641,6 +1679,7 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
               -e 's|@''HAVE_FACCESSAT''@|$(HAVE_FACCESSAT)|g' \
               -e 's|@''HAVE_FCHDIR''@|$(HAVE_FCHDIR)|g' \
               -e 's|@''HAVE_FCHOWNAT''@|$(HAVE_FCHOWNAT)|g' \
+              -e 's|@''HAVE_FDATASYNC''@|$(HAVE_FDATASYNC)|g' \
               -e 's|@''HAVE_FSYNC''@|$(HAVE_FSYNC)|g' \
               -e 's|@''HAVE_FTRUNCATE''@|$(HAVE_FTRUNCATE)|g' \
               -e 's|@''HAVE_GETDTABLESIZE''@|$(HAVE_GETDTABLESIZE)|g' \
@@ -1665,6 +1704,7 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
               -e 's|@''HAVE_USLEEP''@|$(HAVE_USLEEP)|g' \
               -e 's|@''HAVE_DECL_ENVIRON''@|$(HAVE_DECL_ENVIRON)|g' \
               -e 's|@''HAVE_DECL_FCHDIR''@|$(HAVE_DECL_FCHDIR)|g' \
+              -e 's|@''HAVE_DECL_FDATASYNC''@|$(HAVE_DECL_FDATASYNC)|g' \
               -e 's|@''HAVE_DECL_GETDOMAINNAME''@|$(HAVE_DECL_GETDOMAINNAME)|g' \
               -e 's|@''HAVE_DECL_GETLOGIN_R''@|$(HAVE_DECL_GETLOGIN_R)|g' \
               -e 's|@''HAVE_DECL_GETPAGESIZE''@|$(HAVE_DECL_GETPAGESIZE)|g' \
diff --git a/autogen/config.in b/autogen/config.in
index 3b88849a1e7..cbf7c225bd7 100644
--- a/autogen/config.in
+++ b/autogen/config.in
@@ -1273,6 +1273,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define to a type if <wchar.h> does not define. */
 #undef mbstate_t
 
+/* Define to `int' if <sys/types.h> does not define. */
+#undef mode_t
+
 /* Define to the name of the strftime replacement function. */
 #undef my_strftime
 
diff --git a/autogen/configure b/autogen/configure
index adf315b6338..f2ddf8d7a29 100755
--- a/autogen/configure
+++ b/autogen/configure
@@ -669,11 +669,14 @@ REPLACE_FPURGE
 REPLACE_FPRINTF
 REPLACE_FOPEN
 REPLACE_FFLUSH
+REPLACE_FDOPEN
 REPLACE_FCLOSE
 REPLACE_DPRINTF
 HAVE_VDPRINTF
 HAVE_VASPRINTF
 HAVE_RENAMEAT
+HAVE_POPEN
+HAVE_PCLOSE
 HAVE_FTELLO
 HAVE_FSEEKO
 HAVE_DPRINTF
@@ -711,6 +714,7 @@ GNULIB_PRINTF_POSIX
 GNULIB_PRINTF
 GNULIB_POPEN
 GNULIB_PERROR
+GNULIB_PCLOSE
 GNULIB_OBSTACK_PRINTF_POSIX
 GNULIB_OBSTACK_PRINTF
 GNULIB_GETS
@@ -735,6 +739,7 @@ GNULIB_FOPEN
 GNULIB_FGETS
 GNULIB_FGETC
 GNULIB_FFLUSH
+GNULIB_FDOPEN
 GNULIB_FCLOSE
 GNULIB_DPRINTF
 NEXT_AS_FIRST_DIRECTIVE_STDDEF_H
@@ -755,6 +760,7 @@ NEXT_AS_FIRST_DIRECTIVE_STDARG_H
 NEXT_STDARG_H
 NEXT_AS_FIRST_DIRECTIVE_SIGNAL_H
 NEXT_SIGNAL_H
+REPLACE_RAISE
 REPLACE_PTHREAD_SIGMASK
 HAVE_SIGHANDLER_T
 HAVE_TYPE_VOLATILE_SIG_ATOMIC_T
@@ -762,11 +768,13 @@ HAVE_STRUCT_SIGACTION_SA_SIGACTION
 HAVE_SIGACTION
 HAVE_SIGINFO_T
 HAVE_SIGSET_T
+HAVE_RAISE
 HAVE_PTHREAD_SIGMASK
 HAVE_POSIX_SIGNALBLOCKING
 GNULIB_SIGACTION
 GNULIB_SIGPROCMASK
 GNULIB_SIGNAL_H_SIGPIPE
+GNULIB_RAISE
 GNULIB_PTHREAD_SIGMASK
 LIB_PTHREAD_SIGMASK
 REPLACE_TIMEGM
@@ -813,6 +821,7 @@ GNULIB_LSTAT
 GNULIB_LCHMOD
 GNULIB_FUTIMENS
 GNULIB_FSTATAT
+GNULIB_FSTAT
 GNULIB_FCHMODAT
 NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H
 NEXT_INTTYPES_H
@@ -966,6 +975,7 @@ HAVE_DECL_GETUSERSHELL
 HAVE_DECL_GETPAGESIZE
 HAVE_DECL_GETLOGIN_R
 HAVE_DECL_GETDOMAINNAME
+HAVE_DECL_FDATASYNC
 HAVE_DECL_FCHDIR
 HAVE_DECL_ENVIRON
 HAVE_USLEEP
@@ -990,6 +1000,7 @@ HAVE_GETGROUPS
 HAVE_GETDTABLESIZE
 HAVE_FTRUNCATE
 HAVE_FSYNC
+HAVE_FDATASYNC
 HAVE_FCHOWNAT
 HAVE_FCHDIR
 HAVE_FACCESSAT
@@ -1032,6 +1043,7 @@ GNULIB_GETDOMAINNAME
 GNULIB_GETCWD
 GNULIB_FTRUNCATE
 GNULIB_FSYNC
+GNULIB_FDATASYNC
 GNULIB_FCHOWNAT
 GNULIB_FCHDIR
 GNULIB_FACCESSAT
@@ -1039,8 +1051,10 @@ GNULIB_EUIDACCESS
 GNULIB_ENVIRON
 GNULIB_DUP3
 GNULIB_DUP2
+GNULIB_DUP
 GNULIB_CLOSE
 GNULIB_CHOWN
+GNULIB_CHDIR
 GL_GENERATE_ALLOCA_H_FALSE
 GL_GENERATE_ALLOCA_H_TRUE
 ALLOCA_H
@@ -6944,7 +6958,7 @@ esac
   # Code from module nocrash:
   # Code from module pthread_sigmask:
   # Code from module readlink:
-  # Code from module signal:
+  # Code from module signal-h:
   # Code from module sigprocmask:
   # Code from module snippet/_Noreturn:
   # Code from module snippet/arg-nonnull:
@@ -13674,6 +13688,7 @@ fi
 
 
 ### Use libxml (-lxml2) if available
+HAVE_LIBXML2=no
 if test "${with_xml2}" != "no"; then
   ### I'm not sure what the version number should be, so I just guessed.
 
@@ -16607,8 +16622,10 @@ $as_echo "#define HAVE_C99_STRTOLD 1" >>confdefs.h
   fi
 
 
+  GNULIB_CHDIR=0;
   GNULIB_CHOWN=0;
   GNULIB_CLOSE=0;
+  GNULIB_DUP=0;
   GNULIB_DUP2=0;
   GNULIB_DUP3=0;
   GNULIB_ENVIRON=0;
@@ -16616,6 +16633,7 @@ $as_echo "#define HAVE_C99_STRTOLD 1" >>confdefs.h
   GNULIB_FACCESSAT=0;
   GNULIB_FCHDIR=0;
   GNULIB_FCHOWNAT=0;
+  GNULIB_FDATASYNC=0;
   GNULIB_FSYNC=0;
   GNULIB_FTRUNCATE=0;
   GNULIB_GETCWD=0;
@@ -16658,6 +16676,7 @@ $as_echo "#define HAVE_C99_STRTOLD 1" >>confdefs.h
   HAVE_FACCESSAT=1;
   HAVE_FCHDIR=1;
   HAVE_FCHOWNAT=1;
+  HAVE_FDATASYNC=1;
   HAVE_FSYNC=1;
   HAVE_FTRUNCATE=1;
   HAVE_GETDTABLESIZE=1;
@@ -16682,6 +16701,7 @@ $as_echo "#define HAVE_C99_STRTOLD 1" >>confdefs.h
   HAVE_USLEEP=1;
   HAVE_DECL_ENVIRON=1;
   HAVE_DECL_FCHDIR=1;
+  HAVE_DECL_FDATASYNC=1;
   HAVE_DECL_GETDOMAINNAME=1;
   HAVE_DECL_GETLOGIN_R=1;
   HAVE_DECL_GETPAGESIZE=1;
@@ -16992,9 +17012,9 @@ _ACEOF
                    ;;
                esac
 
-               gl_absolute_header_sed='\#'"${gl_dirsep_regex}"'getopt.h#{
-                   s#.*"\(.*'"${gl_dirsep_regex}"'getopt.h\)".*#\1#
-                   s#^/[^/]#//&#
+               gl_absolute_header_sed='\|'"${gl_dirsep_regex}"'getopt.h|{
+                   s|.*"\(.*'"${gl_dirsep_regex}"'getopt.h\)".*|\1|
+                   s|^/[^/]|//&|
                    p
                    q
                  }'
@@ -17749,9 +17769,9 @@ _ACEOF
                    ;;
                esac
 
-               gl_absolute_header_sed='\#'"${gl_dirsep_regex}"'stdint.h#{
-                   s#.*"\(.*'"${gl_dirsep_regex}"'stdint.h\)".*#\1#
-                   s#^/[^/]#//&#
+               gl_absolute_header_sed='\|'"${gl_dirsep_regex}"'stdint.h|{
+                   s|.*"\(.*'"${gl_dirsep_regex}"'stdint.h\)".*|\1|
+                   s|^/[^/]|//&|
                    p
                    q
                  }'
@@ -18381,6 +18401,10 @@ _ACEOF
 
 
 
+          if test $BITSIZEOF_WINT_T -lt 32; then
+    BITSIZEOF_WINT_T=32
+  fi
+
     STDINT_H=stdint.h
   fi
 
@@ -18456,9 +18480,9 @@ _ACEOF
                    ;;
                esac
 
-               gl_absolute_header_sed='\#'"${gl_dirsep_regex}"'inttypes.h#{
-                   s#.*"\(.*'"${gl_dirsep_regex}"'inttypes.h\)".*#\1#
-                   s#^/[^/]#//&#
+               gl_absolute_header_sed='\|'"${gl_dirsep_regex}"'inttypes.h|{
+                   s|.*"\(.*'"${gl_dirsep_regex}"'inttypes.h\)".*|\1|
+                   s|^/[^/]|//&|
                    p
                    q
                  }'
@@ -18499,6 +18523,7 @@ $as_echo "#define GL_TRIGGER_STDC_LIMIT_MACROS 1" >>confdefs.h
 
 
      GNULIB_FCHMODAT=0;
+  GNULIB_FSTAT=0;
   GNULIB_FSTATAT=0;
   GNULIB_FUTIMENS=0;
   GNULIB_LCHMOD=0;
@@ -18612,11 +18637,13 @@ _ACEOF
 
 
   GNULIB_PTHREAD_SIGMASK=0;
+  GNULIB_RAISE=0;
   GNULIB_SIGNAL_H_SIGPIPE=0;
   GNULIB_SIGPROCMASK=0;
   GNULIB_SIGACTION=0;
     HAVE_POSIX_SIGNALBLOCKING=1;
   HAVE_PTHREAD_SIGMASK=1;
+  HAVE_RAISE=1;
   HAVE_SIGSET_T=1;
   HAVE_SIGINFO_T=1;
   HAVE_SIGACTION=1;
@@ -18626,6 +18653,7 @@ _ACEOF
 
   HAVE_SIGHANDLER_T=1;
   REPLACE_PTHREAD_SIGMASK=0;
+  REPLACE_RAISE=0;
 
 
 
@@ -18797,6 +18825,7 @@ $as_echo "#define HAVE_WCHAR_T 1" >>confdefs.h
 
   GNULIB_DPRINTF=0;
   GNULIB_FCLOSE=0;
+  GNULIB_FDOPEN=0;
   GNULIB_FFLUSH=0;
   GNULIB_FGETC=0;
   GNULIB_FGETS=0;
@@ -18821,6 +18850,7 @@ $as_echo "#define HAVE_WCHAR_T 1" >>confdefs.h
   GNULIB_GETS=0;
   GNULIB_OBSTACK_PRINTF=0;
   GNULIB_OBSTACK_PRINTF_POSIX=0;
+  GNULIB_PCLOSE=0;
   GNULIB_PERROR=0;
   GNULIB_POPEN=0;
   GNULIB_PRINTF=0;
@@ -18858,11 +18888,14 @@ $as_echo "#define HAVE_WCHAR_T 1" >>confdefs.h
   HAVE_DPRINTF=1;
   HAVE_FSEEKO=1;
   HAVE_FTELLO=1;
+  HAVE_PCLOSE=1;
+  HAVE_POPEN=1;
   HAVE_RENAMEAT=1;
   HAVE_VASPRINTF=1;
   HAVE_VDPRINTF=1;
   REPLACE_DPRINTF=0;
   REPLACE_FCLOSE=0;
+  REPLACE_FDOPEN=0;
   REPLACE_FFLUSH=0;
   REPLACE_FOPEN=0;
   REPLACE_FPRINTF=0;
@@ -18977,6 +19010,17 @@ fi
 
 
 
+ac_fn_c_check_type "$LINENO" "mode_t" "ac_cv_type_mode_t" "$ac_includes_default"
+if test "x$ac_cv_type_mode_t" = x""yes; then :
+
+else
+
+cat >>confdefs.h <<_ACEOF
+#define mode_t int
+_ACEOF
+
+fi
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C/C++ restrict keyword" >&5
 $as_echo_n "checking for C/C++ restrict keyword... " >&6; }
 if test "${ac_cv_c_restrict+set}" = set; then :
@@ -19163,9 +19207,9 @@ _ACEOF
                    ;;
                esac
 
-               gl_absolute_header_sed='\#'"${gl_dirsep_regex}"'time.h#{
-                   s#.*"\(.*'"${gl_dirsep_regex}"'time.h\)".*#\1#
-                   s#^/[^/]#//&#
+               gl_absolute_header_sed='\|'"${gl_dirsep_regex}"'time.h|{
+                   s|.*"\(.*'"${gl_dirsep_regex}"'time.h\)".*|\1|
+                   s|^/[^/]|//&|
                    p
                    q
                  }'
@@ -19193,8 +19237,6 @@ $as_echo "$gl_cv_next_time_h" >&6; }
 
 
 
-
-
 ac_fn_c_check_decl "$LINENO" "localtime_r" "ac_cv_have_decl_localtime_r" "$ac_includes_default"
 if test "x$ac_cv_have_decl_localtime_r" = x""yes; then :
   ac_have_decl=1
@@ -19399,6 +19441,7 @@ if test $HAVE_DUP2 = 0 || test $REPLACE_DUP2 = 1; then
 
   gl_LIBOBJS="$gl_LIBOBJS dup2.$ac_objext"
 
+
 fi
 
 
@@ -19799,9 +19842,9 @@ else
   HAVE_SYS_LOADAVG_H=0
 fi
 ac_fn_c_check_decl "$LINENO" "getloadavg" "ac_cv_have_decl_getloadavg" "#if HAVE_SYS_LOADAVG_H
-   # include <sys/loadavg.h>
-   #endif
-   #include <stdlib.h>
+    # include <sys/loadavg.h>
+    #endif
+    #include <stdlib.h>
 "
 if test "x$ac_cv_have_decl_getloadavg" = x""yes; then :
 
@@ -20710,9 +20753,9 @@ _ACEOF
                    ;;
                esac
 
-               gl_absolute_header_sed='\#'"${gl_dirsep_regex}"'signal.h#{
-                   s#.*"\(.*'"${gl_dirsep_regex}"'signal.h\)".*#\1#
-                   s#^/[^/]#//&#
+               gl_absolute_header_sed='\|'"${gl_dirsep_regex}"'signal.h|{
+                   s|.*"\(.*'"${gl_dirsep_regex}"'signal.h\)".*|\1|
+                   s|^/[^/]|//&|
                    p
                    q
                  }'
@@ -20954,9 +20997,9 @@ _ACEOF
                    ;;
                esac
 
-               gl_absolute_header_sed='\#'"${gl_dirsep_regex}"'stdarg.h#{
-                   s#.*"\(.*'"${gl_dirsep_regex}"'stdarg.h\)".*#\1#
-                   s#^/[^/]#//&#
+               gl_absolute_header_sed='\|'"${gl_dirsep_regex}"'stdarg.h|{
+                   s|.*"\(.*'"${gl_dirsep_regex}"'stdarg.h\)".*|\1|
+                   s|^/[^/]|//&|
                    p
                    q
                  }'
@@ -21154,9 +21197,9 @@ _ACEOF
                    ;;
                esac
 
-               gl_absolute_header_sed='\#'"${gl_dirsep_regex}"'stddef.h#{
-                   s#.*"\(.*'"${gl_dirsep_regex}"'stddef.h\)".*#\1#
-                   s#^/[^/]#//&#
+               gl_absolute_header_sed='\|'"${gl_dirsep_regex}"'stddef.h|{
+                   s|.*"\(.*'"${gl_dirsep_regex}"'stddef.h\)".*|\1|
+                   s|^/[^/]|//&|
                    p
                    q
                  }'
@@ -21224,9 +21267,9 @@ _ACEOF
                    ;;
                esac
 
-               gl_absolute_header_sed='\#'"${gl_dirsep_regex}"'stdio.h#{
-                   s#.*"\(.*'"${gl_dirsep_regex}"'stdio.h\)".*#\1#
-                   s#^/[^/]#//&#
+               gl_absolute_header_sed='\|'"${gl_dirsep_regex}"'stdio.h|{
+                   s|.*"\(.*'"${gl_dirsep_regex}"'stdio.h\)".*|\1|
+                   s|^/[^/]|//&|
                    p
                    q
                  }'
@@ -21316,9 +21359,9 @@ _ACEOF
                    ;;
                esac
 
-               gl_absolute_header_sed='\#'"${gl_dirsep_regex}"'stdlib.h#{
-                   s#.*"\(.*'"${gl_dirsep_regex}"'stdlib.h\)".*#\1#
-                   s#^/[^/]#//&#
+               gl_absolute_header_sed='\|'"${gl_dirsep_regex}"'stdlib.h|{
+                   s|.*"\(.*'"${gl_dirsep_regex}"'stdlib.h\)".*|\1|
+                   s|^/[^/]|//&|
                    p
                    q
                  }'
@@ -21573,9 +21616,9 @@ _ACEOF
                    ;;
                esac
 
-               gl_absolute_header_sed='\#'"${gl_dirsep_regex}"'sys/stat.h#{
-                   s#.*"\(.*'"${gl_dirsep_regex}"'sys/stat.h\)".*#\1#
-                   s#^/[^/]#//&#
+               gl_absolute_header_sed='\|'"${gl_dirsep_regex}"'sys/stat.h|{
+                   s|.*"\(.*'"${gl_dirsep_regex}"'sys/stat.h\)".*|\1|
+                   s|^/[^/]|//&|
                    p
                    q
                  }'
@@ -21605,6 +21648,8 @@ $as_echo "$gl_cv_next_sys_stat_h" >&6; }
 
 
 
+
+
       ac_fn_c_check_type "$LINENO" "nlink_t" "ac_cv_type_nlink_t" "#include <sys/types.h>
      #include <sys/stat.h>
 "
@@ -21751,9 +21796,9 @@ _ACEOF
                    ;;
                esac
 
-               gl_absolute_header_sed='\#'"${gl_dirsep_regex}"'unistd.h#{
-                   s#.*"\(.*'"${gl_dirsep_regex}"'unistd.h\)".*#\1#
-                   s#^/[^/]#//&#
+               gl_absolute_header_sed='\|'"${gl_dirsep_regex}"'unistd.h|{
+                   s|.*"\(.*'"${gl_dirsep_regex}"'unistd.h\)".*|\1|
+                   s|^/[^/]|//&|
                    p
                    q
                  }'
@@ -21842,7 +21887,9 @@ if test $HAVE_POSIX_SIGNALBLOCKING = 0; then
 
   gl_LIBOBJS="$gl_LIBOBJS sigprocmask.$ac_objext"
 
-  :
+
+
+
 fi
 
 
@@ -21856,6 +21903,12 @@ fi
 
 
       gl_gnulib_enabled_sigprocmask=true
+      if $condition; then
+        func_gl_gnulib_m4code_raise
+      fi
+      if $condition; then
+        func_gl_gnulib_m4code_f691f076f650964c9f5598c3ee487616
+      fi
     fi
   }
   func_gl_gnulib_m4code_stat ()
@@ -21991,6 +22044,9 @@ fi
         func_gl_gnulib_m4code_dosname
       fi
       if $condition; then
+        func_gl_gnulib_m4code_pathmax
+      fi
+      if $condition; then
         func_gl_gnulib_m4code_verify
       fi
     fi
@@ -22105,6 +22161,12 @@ fi
       gl_gnulib_enabled_verify=true
     fi
   }
+  if test $HAVE_DUP2 = 0 || test $REPLACE_DUP2 = 1; then
+    func_gl_gnulib_m4code_f691f076f650964c9f5598c3ee487616
+  fi
+  if test $HAVE_DUP2 = 0 || test $REPLACE_DUP2 = 1; then
+    func_gl_gnulib_m4code_676220fa4366efa9bdbfccf11a857c07
+  fi
   if test $REPLACE_GETOPT = 1; then
     func_gl_gnulib_m4code_be453cec5eecf5731a274f2de7f2db36
   fi
diff --git a/leim/ChangeLog b/leim/ChangeLog
index 23050bf791a..c6ee6d7bbbd 100644
--- a/leim/ChangeLog
+++ b/leim/ChangeLog
@@ -1,3 +1,17 @@
+2011-09-27  Jambunathan K <kjambunathan@gmail.com>
+
+        * quail/indian.el (quail-tamil-itrans-misc-table): Delete it.
+        (quail-tamil-itrans-numerics-and-symbols-table)
+        (quail-tamil-itrans-various-signs-and-digits-table): New variables.
+        ("tamil-itrans"): Show the values of above variables (Bug#9336).
+
+2011-09-22  Kenichi Handa  <handa@m17n.org>
+
+        * quail/indian.el (quail-tamil-itrans-syllable-table)
+        (quail-tamil-itrans-misc-table): New variables.
+        ("tamil-itrans"): Improve the docstring by showing the values of
+        above variables (Bug#9336).
+
 2011-09-06  Paul Eggert  <eggert@cs.ucla.edu>
 
         * Makefile.in (install): install-sh is now in build-aux (Bug#9169).
diff --git a/leim/quail/indian.el b/leim/quail/indian.el
index a3f3963e31d..8bdac3f5842 100644
--- a/leim/quail/indian.el
+++ b/leim/quail/indian.el
@@ -118,12 +118,184 @@
  indian-mlm-itrans-v5-hash "malayalam-itrans" "Malayalam" "MlmIT"
  "Malayalam transliteration by ITRANS method.")
 
+(defvar quail-tamil-itrans-syllable-table
+  (let ((vowels
+         '(("அ" nil "a")
+           ("ஆ" "ா" "A")
+           ("இ" "ி" "i")
+           ("ஈ" "ீ" "I")
+           ("உ" "ு" "u")
+           ("ஊ" "ூ" "U")
+           ("எ" "ெ" "e")
+           ("ஏ" "ே" "E")
+           ("ஐ" "ை" "ai")
+           ("ஒ" "ொ" "o")
+           ("ஓ" "ோ" "O")
+           ("ஔ" "ௌ" "au")))
+        (consonants
+         '(("க" "k")                  ; U+0B95
+           ("ங" "N^")                 ; U+0B99
+           ("ச" "ch")                 ; U+0B9A
+           ("ஞ" "JN")                 ; U+0B9E
+           ("ட" "T")                  ; U+0B9F
+           ("ண" "N")                  ; U+0BA3
+           ("த" "t")                  ; U+0BA4
+           ("ந" "n")                  ; U+0BA8
+           ("ப" "p")                  ; U+0BAA
+           ("ம" "m")                  ; U+0BAE
+           ("ய" "y")                  ; U+0BAF
+           ("ர" "r")                  ; U+0BB0
+           ("ல" "l")                  ; U+0BB2
+           ("வ" "v")                  ; U+0BB5
+           ("ழ" "z")                  ; U+0BB4
+           ("ள" "L")                  ; U+0BB3
+           ("ற" "rh")                 ; U+0BB1
+           ("ன" "nh")                 ; U+0BA9
+           ("ஜ" "j")                  ; U+0B9C
+           ("ஶ" nil)                  ; U+0BB6
+           ("ஷ" "Sh")                 ; U+0BB7
+           ("ஸ" "s")                  ; U+0BB8
+           ("ஹ" "h")                  ; U+0BB9
+           ("க்ஷ" "x" )                   ; U+0B95
+           ))
+        (virama #x0BCD)
+        clm)
+    (with-temp-buffer
+      (insert "\n")
+      (insert "    +")
+      (insert-char ?- 74)
+      (insert "\n    |")
+      (setq clm 6)
+      (dolist (v vowels)
+        (insert (propertize "\t" 'display (list 'space :align-to clm))
+                (car v))
+        (setq clm (+ clm 6)))
+      (insert "\n    |")
+      (setq clm 6)
+      (dolist (v vowels)
+        (insert (propertize "\t" 'display (list 'space :align-to clm))
+                (nth 2 v))
+        (setq clm (+ clm 6)))
+      (dolist (c consonants)
+        (insert "\n----+")
+        (insert-char ?- 74)
+        (insert "\n")
+        (insert (car c) virama
+                (propertize "\t" 'display '(space :align-to 4))
+                "|")
+        (setq clm 6)
+        (dolist (v vowels)
+          (insert (propertize "\t" 'display (list 'space :align-to clm))
+                  (car c) (or (nth 1 v) ""))
+          (setq clm (+ clm 6)))
+        (insert "\n" (or (nth 1 c) "")
+                (propertize "\t" 'display '(space :align-to 4))
+                "|")
+        (setq clm 6)
+
+        (dolist (v vowels)
+          (apply 'insert (propertize "\t" 'display (list 'space :align-to clm))
+                 (if (nth 1 c) (list (nth 1 c) (nth 2 v)) (list "")))
+          (setq clm (+ clm 6))))
+      (insert "\n")
+      (insert "----+")
+      (insert-char ?- 74)
+      (insert "\n")
+      (buffer-string))))
+
+(defvar quail-tamil-itrans-numerics-and-symbols-table
+  (let ((numerics '((?௰ "பத்து") (?௱ "நூறு") (?௲ "ஆயிரம்")))
+        (symbols '((?௳ "நாள்") (?௴ "மாதம்") (?௵ "வருடம்")
+                   (?௶ "பற்று") (?௷ "வரவு") (?௸ "மேற்படி")
+                   (?௹ "ரூபாய்") (?௺ "எண்")))
+        clm)
+    (with-temp-buffer
+      (insert "\n" (make-string 18 ?-) "+" (make-string 60 ?-) "\n")
+      (insert
+       (propertize "\t" 'display '(space :align-to 5)) "numerics"
+       (propertize "\t" 'display '(space :align-to 18)) "|"
+       (propertize "\t" 'display '(space :align-to 45)) "symbols")
+      (insert "\n" (make-string 18 ?-) "+" (make-string 60 ?-) "\n")
+      (dotimes (i 2)
+        (setq clm 0)
+        (dolist (elm numerics)
+          (if (> clm 0)
+              (insert (propertize "\t" 'display (list 'space :align-to clm))))
+          (insert (nth i elm))
+          (setq clm (+ clm 5)))
+        (insert (propertize "\t" 'display '(space :align-to 18)) "|")
+        (setq clm 19)
+        (dolist (elm symbols)
+          (if (> clm 19)
+              (insert (propertize "\t" 'display (list 'space :align-to clm))))
+          (insert (nth i elm))
+          (setq clm (+ clm 8)))
+        (insert "\n"))
+      (insert (make-string 18 ?-) "+" (make-string 60 ?-) "\n")
+      (insert "\n")
+      (buffer-string))))
+
+(defvar quail-tamil-itrans-various-signs-and-digits-table
+  (let ((various '((?ஃ . "H") ("ஸ்ரீ" . "srii") (?ௐ)))
+        (digits "௦௧௨௩௪௫௬௭௮௯")
+        (width 6) clm)
+    (with-temp-buffer
+      (insert "\n" (make-string 18 ?-) "+" (make-string 60 ?-) "\n")
+      (insert
+       (propertize "\t" 'display '(space :align-to 5)) "various"
+       (propertize "\t" 'display '(space :align-to 18)) "|"
+       (propertize "\t" 'display '(space :align-to 45)) "digits")
+
+      (insert "\n" (make-string 18 ?-) "+" (make-string 60 ?-) "\n")
+      (setq clm 0 )
+
+      (dotimes (i (length various))
+        (insert (propertize "\t" 'display (list 'space :align-to clm))
+                (car (nth i various)))
+        (setq clm (+ clm width)))
+      (insert (propertize "\t" 'display '(space :align-to 18)) "|")
+      (setq clm 20)
+      (dotimes (i 10)
+        (insert (propertize "\t" 'display (list 'space :align-to clm))
+                (aref digits i))
+        (setq clm (+ clm width)))
+      (insert "\n")
+      (setq clm 0)
+      (dotimes (i (length various))
+        (insert (propertize "\t" 'display (list 'space :align-to clm))
+                (or (cdr (nth i various)) ""))
+        (setq clm (+ clm width)))
+      (insert (propertize "\t" 'display '(space :align-to 18)) "|")
+      (setq clm 20)
+      (dotimes (i 10)
+        (insert (propertize "\t" 'display (list 'space :align-to clm))
+                (format "%d" i))
+        (setq clm (+ clm width)))
+      (insert "\n" (make-string 18 ?-) "+" (make-string 60 ?-) "\n")
+      (buffer-string))))
+
 (if nil
     (quail-define-package "tamil-itrans" "Tamil" "TmlIT" t "Tamil ITRANS"))
 (quail-define-indian-trans-package
  indian-tml-itrans-v5-hash "tamil-itrans" "Tamil" "TmlIT"
- "Tamil transliteration by ITRANS method.")
+ "Tamil transliteration by ITRANS method.
+
+You can input characters using the following mapping tables.
+    Example: To enter வணக்கம், type vaNakkam.
+
+### Basic syllables (consonants + vowels) ###
+\\<quail-tamil-itrans-syllable-table>
+
+### Miscellaneous (various signs + digits) ###
+\\<quail-tamil-itrans-various-signs-and-digits-table>
+
+### Others (numerics + symbols) ###
+
+Characters below have no ITRANS method associated with them.
+Their descriptions are included for easy reference.
+\\<quail-tamil-itrans-numerics-and-symbols-table>
 
+Full key sequences are listed below:")
 
 ;;;
 ;;; Input by Inscript
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 92324036dc5..ec867fee08b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2011-09-27  Leo Liu  <sdl.web@gmail.com>
+
+        * ido.el (ido-read-internal): Accept cons cell HIST arg.
+
 2011-09-25  Michael Albinus  <michael.albinus@gmx.de>
 
         * net/dbus.el (dbus-unregister-object): Don't release services for
@@ -9,6 +13,13 @@
         function that picks between cfengine 2 and 3 support
         automatically.  Update docs accordingly.
 
+2011-09-22  Kenichi Handa  <handa@m17n.org>
+
+        * language/ind-util.el (indian-tml-base-table): Add TAMIL DIGIT
+        ZERO.
+        (indian-itrans-v5-table-for-tamil): New variable.
+        (indian-tml-itrans-v5-hash): Use the above variable (Bug#9336).
+
 2011-09-22  Ken Manheimer  <ken.manheimer@gmail.com>
 
         * allout.el (allout-this-command-hid-stuff): Buffer-local variable
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index ab324b7cd8b..c535f4a9549 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2011-09-27  Daiki Ueno  <ueno@unixuser.org>
+
+        * plstore.el (plstore-select-keys, plstore-encrypt-to): Clarify
+        documentation.
+
 2011-09-26  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * nnimap.el (nnimap-wait-for-response): Message less (bug#9540).
diff --git a/lisp/gnus/plstore.el b/lisp/gnus/plstore.el
index ab78e508480..340c7255958 100644
--- a/lisp/gnus/plstore.el
+++ b/lisp/gnus/plstore.el
@@ -80,9 +80,10 @@
   "Control whether or not to pop up the key selection dialog.
 
 If t, always asks user to select recipients.
-If nil, query user only when `plstore-encrypt-to' is not set.
-If neither t nor nil, doesn't ask user.  In this case, symmetric
-encryption is used."
+If nil, query user only when a file's default recipients are not
+known (i.e. `plstore-encrypt-to' is not locally set in the buffer
+visiting a plstore file).
+If neither t nor nil, doesn't ask user."
   :type '(choice (const :tag "Ask always" t)
                  (const :tag "Ask when recipients are not set" nil)
                  (const :tag "Don't ask" silent))
@@ -90,7 +91,8 @@ encryption is used."
 
 (defvar plstore-encrypt-to nil
   "*Recipient(s) used for encrypting secret entries.
-May either be a string or a list of strings.")
+May either be a string or a list of strings.  If it is nil,
+symmetric encryption will be used.")
 
 (put 'plstore-encrypt-to 'safe-local-variable
      (lambda (val)
diff --git a/lisp/ido.el b/lisp/ido.el
index 4086000e3e9..46ac5784d0e 100644
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -1826,7 +1826,7 @@ This function also adds a hook to the minibuffer."
 ;;       e.g. the file name may be ignored or joined with ido-current-directory, and
 ;;       the relevant function is called (find-file, write-file, etc).
 
-(defun ido-read-internal (item prompt history &optional default require-match initial)
+(defun ido-read-internal (item prompt hist &optional default require-match initial)
   "Perform the `ido-read-buffer' and `ido-read-file-name' functions.
 Return the name of a buffer or file selected.
 PROMPT is the prompt to give to the user.
@@ -1984,7 +1984,7 @@ If INITIAL is non-nil, it specifies the initial input string."
                 (read-from-minibuffer (ido-make-prompt item prompt)
                                       (prog1 ido-text-init
                                         (setq ido-text-init nil))
-                                      ido-completion-map nil history))))
+                                      ido-completion-map nil hist))))
       (ido-trace "read-from-minibuffer" ido-final-text)
       (if (get-buffer ido-completion-buffer)
           (kill-buffer ido-completion-buffer))
@@ -2155,7 +2155,12 @@ If INITIAL is non-nil, it specifies the initial input string."
 
          (t
           (setq done t))))))
-    (add-to-history (or history 'minibuffer-history) ido-selected)
+    (add-to-history (cond
+                     ((consp hist)
+                      (or (car hist) 'minibuffer-history))
+                     (hist hist)
+                     (t 'minibuffer-history))
+                    ido-selected)
     ido-selected))
 
 (defun ido-edit-input ()
diff --git a/lisp/language/ind-util.el b/lisp/language/ind-util.el
index 56893af1479..0e548420383 100644
--- a/lisp/language/ind-util.el
+++ b/lisp/language/ind-util.el
@@ -271,7 +271,7 @@
     (;; Misc Symbols
      nil ?$,1<"(B ?$,1<#(B nil ?$,1<m(B nil nil)
     (;; Digits
-     nil ?$,1='(B ?$,1=((B ?$,1=)(B ?$,1=*(B ?$,1=+(B ?$,1=,(B ?$,1=-(B ?$,1=.(B ?$,1=/(B)
+     ?$,1=&(B ?$,1='(B ?$,1=((B ?$,1=)(B ?$,1=*(B ?$,1=+(B ?$,1=,(B ?$,1=-(B ?$,1=.(B ?$,1=/(B)
     (;; Inscript-extra (4)  (#, $, ^, *, ])
      "$,1<m<P(B" "$,1<P<m(B" "$,1<D<m<P(B" nil nil)))
 
@@ -305,6 +305,25 @@
     (;; misc -- 7
      ".N" (".n" "M") "H" ".a" ".h" ("AUM" "OM") "..")))
 
+(defvar indian-itrans-v5-table-for-tamil
+  '(;; for encode/decode
+    (;; vowels -- 18
+     "a" ("aa" "A") "i" ("ii" "I") "u" ("uu" "U")
+     ("RRi" "R^i") ("LLi" "L^i") (".c" "e.c") "E" "e" "ai"
+     "o.c"  "O"   "o"   "au"  ("RRI" "R^I") ("LLI" "L^I"))
+    (;; consonants -- 40
+     "k"   "kh"  "g"   "gh"  ("~N" "N^")
+     "ch" ("Ch" "chh") "j" "jh" ("~n" "JN")
+     "T"   "Th"  "D"   "Dh"  "N"
+     "t"   "th"  "d"   "dh"  "n"   "nh"
+     "p"   "ph"  "b"   "bh"  "m"
+     "y"   "r"   "rh"  "l"   ("L" "ld") ("J" "z")  ("v" "w")
+     "sh" ("Sh" "shh") "s" "h"
+     "q" "K" "G" nil ".D" ".Dh" "f" ("Y" "yh")
+     ("GY" "dny") "x")
+    (;; misc -- 7
+     ".N" (".n" "M") "H" ".a" ".h" ("AUM" "OM") "..")))
+
 (defvar indian-kyoto-harvard-table
   '(;; for encode/decode
     (;; vowel
@@ -508,7 +527,7 @@
 
 (defvar indian-tml-itrans-v5-hash
   (indian-make-hash indian-tml-base-table
-                          indian-itrans-v5-table))
+                          indian-itrans-v5-table-for-tamil))
 )
 
 (defmacro indian-translate-region (from to hashtable encode-p)
diff --git a/src/ChangeLog b/src/ChangeLog
index 8ac09c6c821..7b09cb744a3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -774,6 +774,11 @@
         rather than rolling our own approximation.
         (SCROLL_BAR_VEC_SIZE): Remove; not used.
 
+2011-09-27  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * lread.c (readevalloop): Use correct code for NBSP.
+        (read1): Likewise.  (Bug#9608)
+
 2011-09-25  Michael Albinus  <michael.albinus@gmx.de>
 
         * dbusbind.c (Fdbus_register_signal): When service is not
diff --git a/src/lread.c b/src/lread.c
index e427688fdc7..1179d63436f 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -1801,7 +1801,7 @@ readevalloop (Lisp_Object readcharfun,
 
       /* Ignore whitespace here, so we can detect eof.  */
       if (c == ' ' || c == '\t' || c == '\n' || c == '\f' || c == '\r'
-          || c == 0x8a0)  /* NBSP */
+          || c == 0xa0)  /* NBSP */
         goto read_next;
 
       if (!NILP (Vpurify_flag) && c == '(')
@@ -2689,7 +2689,7 @@ read1 (register Lisp_Object readcharfun, int *pch, int first_in_list)
           uninterned_symbol = 1;
           c = READCHAR;
           if (!(c > 040
-                && c != 0x8a0
+                && c != 0xa0    /* NBSP */
                 && (c >= 0200
                     || strchr ("\"';()[]#`,", c) == NULL)))
             {
@@ -3037,7 +3037,7 @@ read1 (register Lisp_Object readcharfun, int *pch, int first_in_list)
     default:
     default_label:
       if (c <= 040) goto retry;
-      if (c == 0x8a0) /* NBSP */
+      if (c == 0xa0) /* NBSP */
         goto retry;
 
     read_symbol:
@@ -3078,7 +3078,7 @@ read1 (register Lisp_Object readcharfun, int *pch, int first_in_list)
               c = READCHAR;
             }
           while (c > 040
-                 && c != 0x8a0 /* NBSP */
+                 && c != 0xa0 /* NBSP */
                  && (c >= 0200
                      || strchr ("\"';()[]#`,", c) == NULL));