merge from trunk

1 files changed, 26 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 27395616072..35dbeb6065c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,29 @@
+2013-08-22  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * configure.ac (EMACS_CONFIG_OPTIONS): Quote systematically (Bug#13274).
+        This improves on the patch already installed, by quoting options
+        that contain spaces and suchlike systematically, so that
+        EMACS_CONFIG_OPTIONS is no longer ambiguous when options contain
+        these characters.
+
+2013-08-21  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Port close-on-exec pty creation to FreeBSD 9.1-RELEASE (Bug#15129).
+        * configure.ac (PTY_OPEN): If posix_openpt with O_CLOEXEC fails
+        and reports EINVAL, try it again without O_CLOEXEC.  This should
+        port PTY_OPEN to FreeBSD 9, which stupidly rejects O_CLOEXEC.
+        What were they thinking?
+
+2013-08-20  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * Makefile.in (distclean, bootstrap-clean, maintainer-clean):
+        Fix shell-operator precedence problem in previous change.
+
+2013-08-20  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (distclean, bootstrap-clean, maintainer-clean):
+        Clean test/automated if present.
+
 2013-08-19  Paul Eggert  <eggert@cs.ucla.edu>
 
         Merge from gnulib, incorporating: