Merge from trunk and resolve conflicts.

1 files changed, 24 insertions, 0 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 199d46f4984..6c31841c130 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,27 @@
+2014-09-23  Paul Eggert  <eggert@cs.ucla.edu>
+
+        movemail: don't dump core if the current time is outlandish
+        * movemail.c (popmail): Check for mbx_delimit_begin failure.
+        (mbx_delimit_begin): Fail if the current time is so outlandish
+        that localtime would fail or asctime would have undefined
+        behavior.  Use strftime to avoid asctime undefined behavior.
+
+2014-09-01  Paul Eggert  <eggert@cs.ucla.edu>
+
+        --enable-silent-rules now suppresses more chatter.
+        * Makefile.in (AM_DEFAULT_VERBOSITY, AM_V_CC, am__v_CC_)
+        (am__v_CC_0, am__v_CC_1, AM_V_CCLD, am__v_CCLD_, am__v_CCLD_0)
+        (am__v_CCLD_1): New macros, taken from Automake.
+        (regex.o, etags${EXEEXT}, ctags${EXEEXT}, ebrowse${EXEEXT})
+        (profile${EXEEXT}, make-docfile${EXEEXT}, movemail${EXEEXT})
+        (pop.o, emacsclient${EXEEXT}, emacsclientw${EXEEXT})
+        (emacsclientw${EXEEXT}, ntlib.o, hexl${EXEEXT})
+        (update-game-score${EXEEXT}): Use them.
+
+        * etags.c (emacs_strchr, emacs_strrchr): Remove.
+        All uses replaced by strchr and strrchr, which are on all
+        target platforms now.
+
 2014-07-15  Paul Eggert  <eggert@cs.ucla.edu>
 
         Use "b" flag more consistently; avoid "t" (Bug#18006).