merge master, fix conflicts

1 files changed, 19 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 36edfe638d4..cca9100ddf7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2015-01-11  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Default to 'configure --enable-silent-rules'
+        This greatly shortens the 'make' output, making it more readable
+        and useful.  For example, on my platform it shortens a
+        4125-character line "gcc -std=gnu99 -c -Demacs -I. -I. -I../lib
+        ... emacs.c" -- a line so long that it's hard to see what's going
+        on or where the diagnostics are -- to just "CC emacs.o".
+        * INSTALL: Document this.
+        * configure.ac: Add AM_SILENT_RULES([yes]).
+        (AM_DEFAULT_VERBOSITY): Remove now-unnecessary initialization.
+        Fixes: bug#19501
+
+2015-01-06  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Merge from gnulib
+        * lib/stdio.in.h, m4/stdio_h.m4: Update from gnulib, incorporating:
+        2015-01-05 stdio: fix use of PRIdMAX on modern mingw
+
 2015-01-04  Paul Eggert  <eggert@cs.ucla.edu>
 
         * INSTALL: Mention 'make WERROR_CFLAGS='.