closer to 1.4.9

[Eric Blake]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Now that Tandem works, all I need now before releasing 1.4.9 is a chunk of
enough time.  But in integrating with the latest gnulib, I noticed this
source patch (thanks to Bruno for adding a NEWS file in gnulib that makes
it easier to track such changes); I also missed a paragraph in the manual
while doing doc merges to head.

2007-03-16  Eric Blake  <address@hidden>

        * doc/m4.texinfo (Mkstemp): Tweak wording.
        * src/output.c (output_init): Adjust to latest gnulib.

- --
Don't work too hard, make some time for fun as well!

Eric Blake             address@hidden
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Cygwin)
Comment: Public key at home.comcast.net/~ericblake/eblake.gpg
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFF+o6A84KuGfSFAYARAsxzAKCHmpziD4BLVOzzIhHrXUo87wrz4gCfRjZr
YTcdLHCPf7NisJwV+qzHjJo=
=htEk
-----END PGP SIGNATURE-----

Index: doc/m4.texinfo
===================================================================
RCS file: /sources/m4/m4/doc/m4.texinfo,v
retrieving revision 1.1.1.1.2.121
diff -u -p -r1.1.1.1.2.121 m4.texinfo
--- doc/m4.texinfo      7 Mar 2007 15:52:02 -0000       1.1.1.1.2.121
+++ doc/m4.texinfo      16 Mar 2007 12:27:17 -0000
@@ -5357,6 +5357,9 @@ that file name.  Hence, @acronym{POSIX} 
 implementations of @code{m4} provide the secure @code{mkstemp} builtin,
 and that users of @code{m4} check for its existence.
 
+The expansion is void and an error issued if a temporary file could
+not be created.
+
 The macros @code{mkstemp} and @code{maketemp} are recognized only with
 parameters.
 @end deffn
Index: src/output.c
===================================================================
RCS file: /sources/m4/m4/src/Attic/output.c,v
retrieving revision 1.1.1.1.2.18
diff -u -p -r1.1.1.1.2.18 output.c
--- src/output.c        15 Nov 2006 00:44:08 -0000      1.1.1.1.2.18
+++ src/output.c        16 Mar 2007 12:27:17 -0000
@@ -1,7 +1,7 @@
 /* GNU m4 -- A simple macro processor
 
-   Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 2004, 2005, 2006 Free
-   Software Foundation, Inc.
+   Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 2004, 2005, 2006,
+   2007 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -131,7 +131,8 @@ threshold_diversion_CB (const void *elt,
 void
 output_init (void)
 {
-  diversion_table = gl_oset_create_empty (GL_AVLTREE_OSET, cmp_diversion_CB);
+  diversion_table = gl_oset_create_empty (GL_AVLTREE_OSET, cmp_diversion_CB,
+                                         NULL);
   div0.u.file = stdout;
   output_diversion = &div0;
   output_file = stdout;