Merge branch 'trunk' into xwidget

Conflicts:
	src/xdisp.c

1 files changed, 33 insertions, 0 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 8746657517e..cbcd698e8b1 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,36 @@
+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.
+        (make-manuals): Avoid hard-coding list of misc manuals.
+        Add the option to only make certain type(s) of output.
+        (manual-misc-html): Special-case ccmode and efaq.
+        (manual-html-mono, manual-html-node, manual-pdf, manual-ps):
+        Move creation of output directory here from make-manuals.
+        (manual-html-fix-index-2): Avoid dynamic reference to `f'.
+
+2013-07-05  Glenn Morris  <rgm@gnu.org>
+
+        * admin.el (make-manuals): Use a standard location for lispintro.
+        Use a pdf/ subdirectory for pdf versions.
+
 2013-06-29  Glenn Morris  <rgm@gnu.org>
 
         * admin.el (make-manuals): Don't bother with txt or dvi any more.