Merge from trunk and from gnulib stdio.

1 files changed, 9 insertions, 0 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index bd1a84cf0b9..cc713f0b68c 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,12 @@
+2011-03-21  Paul Eggert  <eggert@cs.ucla.edu>
+
+        fakemail: Remove dependency on ignore-value.
+        This undoes some of the recent fakemail-related changes.
+        It is made possible due to recent changes to gnulib's stdio module.
+        * Makefile.in (fakemail${EXEEXT}): Do not depend on ignore-value.h.
+        * fakemail.c: Do not include ignore-value.h.
+        (put_line): Do not use ignore_value.
+
 2011-03-03  Drake Wilson  <drake@begriffli.ch>  (tiny change)
 
         * emacsclient.c (longopts): Add quiet.