lisp/emacs-lisp/cl-macs.el: Fix typos in docstrings.

[bpt/emacs.git] / admin / merge-gnulib

diff --git a/admin/merge-gnulib b/admin/merge-gnulib
index 792818b..82e0cd7 100755 (executable)
--- a/admin/merge-gnulib
+++ b/admin/merge-gnulib
@@ -4,7 +4,7 @@
 #
 #      admin/merge-gnulib
 
-# Copyright 2012 Free Software Foundation, Inc.
+# Copyright 2012-2013 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -29,20 +29,22 @@ GNULIB_MODULES='
   alloca-opt c-ctype c-strcase
   careadlinkat close-stream crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512
   dtoastr dtotimespec dup2 environ execinfo faccessat
-  fcntl-h filemode getloadavg getopt-gnu gettime gettimeofday
-  ignore-value intprops largefile lstat
-  manywarnings mktime pselect pthread_sigmask readlink
-  socklen stat-time stdalign stdarg stdbool stdio
+  fcntl fcntl-h fdatasync fdopendir filemode fstatat fsync
+  getloadavg getopt-gnu gettime gettimeofday
+  intprops largefile lstat
+  manywarnings memrchr mktime
+  pipe2 pselect pthread_sigmask putenv qacl readlink readlinkat
+  sig2str socklen stat-time stdalign stdarg stdbool stdio
   strftime strtoimax strtoumax symlink sys_stat
-  sys_time time timer-time timespec-add timespec-sub utimens
+  sys_time time timer-time timespec-add timespec-sub unsetenv utimens
   warnings
 '
 
 GNULIB_TOOL_FLAGS='
-  --avoid=at-internal
-  --avoid=errno --avoid=fchdir --avoid=fcntl --avoid=fstat
+  --avoid=close --avoid=dup
+  --avoid=fchdir --avoid=fstat
   --avoid=malloc-posix --avoid=msvc-inval --avoid=msvc-nothrow
-  --avoid=openat-die --avoid=openat-h
+  --avoid=open --avoid=openat-die --avoid=opendir
   --avoid=raise
   --avoid=save-cwd --avoid=select --avoid=sigprocmask --avoid=sys_types
   --avoid=threadlib