Merge from trunk

4 files changed, 28 insertions, 9 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 592a41968db..cbcd698e8b1 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,21 @@
+2013-07-12  Glenn Morris  <rgm@gnu.org>
+
+        * admin.el (manual-style-string): Use non-abbreviated url.
+
+2013-07-09  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Port recent close-on-exec changes to Cygwin (Bug#14821).
+        * merge-gnulib (GNULIB_TOOL_FLAGS): Don't avoid binary-io.
+
+        Handle error numbers a bit more reliably.
+        * merge-gnulib (GNULIB_MODULES): Remove ignore-value.
+
+2013-07-07  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Make file descriptors close-on-exec when possible (Bug#14803).
+        * merge-gnulib (GNULIB_MODULES): Add fcntl, pipe2.
+        (GNULIB_TOOL_FLAGS): Avoid binary-io, close.  Do not avoid fcntl.
+
 2013-07-06  Glenn Morris  <rgm@gnu.org>
 
         * admin.el (manual-misc-manuals): New function.
diff --git a/admin/admin.el b/admin/admin.el
index 927f68e978a..9c0015fc413 100644
--- a/admin/admin.el
+++ b/admin/admin.el
@@ -283,7 +283,7 @@ Optional argument TYPE is type of output (nil means all)."
 <meta name=\"DC.title\" content=\"gnu.org\">\n\n")
 
 (defconst manual-style-string "<style type=\"text/css\">
-@import url('/s/emacs/manual.css');\n</style>\n")
+@import url('/software/emacs/manual.css');\n</style>\n")
 
 (defun manual-misc-html (name root html-node-dir html-mono-dir)
   ;; Hack to deal with the cases where .texi creates a different .info.
diff --git a/admin/merge-gnulib b/admin/merge-gnulib
index c8bfe0dacc3..82e0cd77fca 100755
--- a/admin/merge-gnulib
+++ b/admin/merge-gnulib
@@ -29,11 +29,11 @@ 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 fdatasync fdopendir filemode fstatat fsync
+  fcntl fcntl-h fdatasync fdopendir filemode fstatat fsync
   getloadavg getopt-gnu gettime gettimeofday
-  ignore-value intprops largefile lstat
+  intprops largefile lstat
   manywarnings memrchr mktime
-  pselect pthread_sigmask putenv qacl readlink readlinkat
+  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 unsetenv utimens
@@ -41,8 +41,8 @@ GNULIB_MODULES='
 '
 
 GNULIB_TOOL_FLAGS='
-  --avoid=dup
-  --avoid=fchdir --avoid=fcntl --avoid=fstat
+  --avoid=close --avoid=dup
+  --avoid=fchdir --avoid=fstat
   --avoid=malloc-posix --avoid=msvc-inval --avoid=msvc-nothrow
   --avoid=open --avoid=openat-die --avoid=opendir
   --avoid=raise
diff --git a/admin/notes/changelogs b/admin/notes/changelogs
index ae9ce40aa0a..1025cfc217f 100644
--- a/admin/notes/changelogs
+++ b/admin/notes/changelogs
@@ -3,9 +3,10 @@ entry in their name, not yours.
 
 
 http://lists.gnu.org/archive/html/emacs-devel/2007-09/msg00793.html
-http://lists.gnu.org/archive/html/emacs-devel/2013-06/msg00485.html
-  There is no need to make trivial change log entries for files such
-  as NEWS, MAINTAINERS, and FOR-RELEASE.
+  There is no need to make change log entries for files such as NEWS,
+  MAINTAINERS, and FOR-RELEASE.
+"There is no need" means you don't have to, but you can if you want to.
+
 
 http://lists.gnu.org/archive/html/emacs-devel/2006-12/msg01135.html
   There is no need to indicate regeneration of files such as configure