1 files changed, 60 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index bd938539421..967284b485d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,62 @@
+2013-07-13  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * configure.ac: Simplify --with-file-notification handling.
+
+2013-07-12  Glenn Morris  <rgm@gnu.org>
+
+        * configure.ac: If with-file-notification=yes, if gfile not found,
+        go on to try inotify (not on MS Windows or Nextstep).
+
+2013-07-12  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Fix races with threads and file descriptors.
+        * configure.ac (PTY_TTY_NAME_SPRINTF): Use emacs_close, not close.
+
+2013-07-10  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * Makefile.in (removenullpaths): Remove adjacent null paths (Bug#14835).
+
+2013-07-09  Peter Rosin  <peda@lysator.liu.se>  (tiny change>
+
+        * configure.ac (HAVE_W32): Avoid nested functions (the second
+        argument of AC_LANG_PROGRAM is already expanded inside a
+        function).  (Bug#14830)
+
+2013-07-09  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Port recent close-on-exec changes to Cygwin (Bug#14821).
+        * lib/binary-io.c, lib/binary-io.h: New files.
+        Merge from gnulib, incorporating:
+        2013-07-09 accept4, dup3, pipe2: port to Cygwin
+        * lib/pipe2.c: Update from gnulib, as part of this merge.
+        * lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
+
+        Handle errno and exit status a bit more carefully.
+        * lib/ignore-value.h: Remove this gnulib-imported file.
+        * lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
+
+2013-07-08  Magnus Henoch <magnus.henoch@gmail.com> (tiny change)
+
+        * configure.ac (HAVE_IMAGEMAGICK): Check on NS also (Bug#14798).
+
+2013-07-08  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Try to fix FreeBSD 9.1 porting problem (Bug#14812).
+        This incorporates the following merge from gnulib:
+        2013-07-07 stdalign, verify: port to FreeBSD 9.1, to C11, and to C++11
+
+2013-07-07  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Port to Ubuntu 10 (Bug#14803).
+        * configure.ac (accept4): New function to check for.
+
+        Make file descriptors close-on-exec when possible (Bug#14803).
+        * configure.ac (mkostemp): New function to check for.
+        (PTY_OPEN): Pass O_CLOEXEC to posix_openpt.
+        * lib/fcntl.c, lib/getdtablesize.c, lib/pipe2.c, m4/fcntl.m4:
+        * m4/getdtablesize.m4, m4/pipe2.m4: New files, taken from gnulib.
+        * lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
+
 2013-07-03  Christoph Egger  <christoph@debian.org>  (tiny change)
 
         * configure.ac (emacs_broken_SIGIO): Set on gnu-kfreebsd to avoid hang.
@@ -36,7 +95,7 @@
         * Makefile.in (install-arch-indep): Do not create directories passed
         with --enable-locallisppath.
 
-2013-06-24  Glenn Morris  <rgm@fencepost.gnu.org>
+2013-06-24  Glenn Morris  <rgm@gnu.org>
 
         * configure.ac: Include X11/X.h when testing for Xft.h.  (Bug#14684)