removing fakemail's dependency on ignore-value

removing fakemail's dependency on ignore-value

[Paul Eggert]

[-- Attachment #1: Type: text/plain, Size: 3429 bytes --]

A recent change to gnulib makes it possible to remove fakemail's
use of ignore-value.h and ignore_value.  I plan to adapt Emacs
to this change by installing the following patch.  It brings in
a new gnulib module, stdio, but I expect that this does not affect the
MS-DOS or MS-Windows ports as they can continue to use their own
stdio.h.

The main patch is below; the autogenerated files are in the
full patch, which is attached.

=== modified file 'ChangeLog'
--- ChangeLog	2011-03-20 23:58:23 +0000
+++ ChangeLog	2011-03-21 05:05:49 +0000
@@ -1,3 +1,11 @@
+2011-03-21  Paul Eggert  <eggert@cs.ucla.edu>
+
+	fakemail: Remove dependency on ignore-value.
+	* Makefile.in (GNULIB_MODULES): Add stdio.
+	* lib/stdio.in.h, m4/stdio_h.m4: New files, automatically
+	imported from gnulib.
+	* .bzrignore: Add lib/stdio.h.
+
 2011-03-20  Glenn Morris  <rgm@gnu.org>
 
 	* autogen/: New directory, to be excluded from releases.

=== modified file '.bzrignore'
--- .bzrignore	2011-03-21 00:11:59 +0000
+++ .bzrignore	2011-03-21 05:05:49 +0000
@@ -44,6 +44,7 @@
 lib/arg-nonnull.h
 lib/c++defs.h
 lib/getopt.h
+lib/stdio.h
 lib/stdlib.h
 lib/sys/
 lib/time.h

=== modified file 'Makefile.in'
--- Makefile.in	2011-03-13 17:39:04 +0000
+++ Makefile.in	2011-03-21 05:04:41 +0000
@@ -332,7 +332,7 @@
 # as per $(gnulib_srcdir)/DEPENDENCIES.
 GNULIB_MODULES = \
   crypto/md5 dtoastr filemode getloadavg getopt-gnu \
-  ignore-value intprops lstat mktime readlink strftime symlink sys_stat
+  ignore-value intprops lstat mktime readlink stdio strftime symlink sys_stat
 GNULIB_TOOL_FLAGS = \
  --import --no-changelog --no-vc-files --makefile-name=gnulib.mk
 sync-from-gnulib: $(gnulib_srcdir)

=== modified file 'lib-src/ChangeLog'
--- lib-src/ChangeLog	2011-03-12 19:19:47 +0000
+++ lib-src/ChangeLog	2011-03-21 05:04:41 +0000
@@ -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.

=== modified file 'lib-src/Makefile.in'
--- lib-src/Makefile.in	2011-02-26 08:36:56 +0000
+++ lib-src/Makefile.in	2011-03-21 05:04:41 +0000
@@ -353,7 +353,7 @@
 pop.o: ${srcdir}/pop.c ${srcdir}/../lib/min-max.h ../src/config.h
 	$(CC) -c ${CPP_CFLAGS} ${MOVE_FLAGS} ${srcdir}/pop.c
 
-fakemail${EXEEXT}: ${srcdir}/fakemail.c ${srcdir}/../lib/ignore-value.h ../src/config.h
+fakemail${EXEEXT}: ${srcdir}/fakemail.c ../src/config.h
 	$(CC) ${ALL_CFLAGS} ${srcdir}/fakemail.c $(LOADLIBES) -o fakemail
 
 emacsclient${EXEEXT}: ${srcdir}/emacsclient.c ../src/config.h

=== modified file 'lib-src/fakemail.c'
--- lib-src/fakemail.c	2011-02-26 05:36:51 +0000
+++ lib-src/fakemail.c	2011-03-21 05:04:41 +0000
@@ -62,8 +62,6 @@
 
 /* This is to declare cuserid.  */
 #include <unistd.h>
-
-#include <ignore-value.h>
 \f
 /* Type definitions */
 
@@ -500,7 +498,7 @@
 		}
 	    }
 	  /* Output that much, then break the line.  */
-	  ignore_value (fwrite (s, 1, breakpos - s, rem->handle));
+	  fwrite (s, 1, breakpos - s, rem->handle);
 	  column = 8;
 
 	  /* Skip whitespace and prepare to print more addresses.  */


[-- Attachment #2: patch.txt.gz --]
[-- Type: application/x-gzip, Size: 11651 bytes --]