Re: closer to 1.4.9

Index: NEWS
===================================================================
RCS file: /sources/m4/m4/NEWS,v
retrieving revision 1.41
diff -u -p -r1.41 NEWS
--- NEWS	7 Mar 2007 15:31:14 -0000	1.41
+++ NEWS	24 Mar 2007 21:22:38 -0000
@@ -196,7 +196,7 @@ promoted to 2.0.
 
 *** Improvements made in the 1.4.x stable series have been incorporated.
 
-* Version 1.4.9 - ?? ??? 2007, by ???  (CVS version 1.4.8c)
+* Version 1.4.9 - 23 Mar 2007, by Eric Blake  (CVS version 1.4.8c)
 
 ** Minor documentation and portability cleanups.
 
@@ -220,7 +220,7 @@ promoted to 2.0.
 ** The `-E'/`--fatal-warnings' command-line option now has two levels.  When
    specified only once, warnings affect exit status, but execution
    continues, so that you can see all warnings instead of fixing them one
-   at a time.  To acheive 1.4.8 behavior, where the first warning
+   at a time.  To achieve 1.4.8 behavior, where the first warning
    immediately exits, specify -E twice on the command line.
 
 ** A new `--warn-macro-sequence' command-line option allows detection of
Index: THANKS
===================================================================
RCS file: /sources/m4/m4/THANKS,v
retrieving revision 1.12
diff -u -p -r1.12 THANKS
--- THANKS	25 Feb 2007 22:43:55 -0000	1.12
+++ THANKS	24 Mar 2007 21:22:38 -0000
@@ -8,6 +8,7 @@ these people.  Help me keep it complete 
 Akiko Matsushita	[email protected]
 Akim Demaille		[email protected]
 Alan Magnuson		[email protected]
+Albert Chin		[email protected]
 Alexander Lehmann	[email protected]
 Amos Shapira		[email protected]
 Andreas Büning		[email protected]
@@ -80,6 +81,7 @@ Mark Seiden		[email protected]
 Martin Koeppe		[email protected]
 Massimo Dal Zotto	[email protected]
 Matt Kraai		[email protected]
+Matthew Woehlke		[email protected]
 Matthias Rabe		[email protected]
 Michael Fetterman	[email protected]
 Michael L. Welcome	[email protected]
Index: bootstrap
===================================================================
RCS file: /sources/m4/m4/bootstrap,v
retrieving revision 1.44
diff -u -p -r1.44 bootstrap
--- bootstrap	16 Nov 2006 19:01:15 -0000	1.44
+++ bootstrap	24 Mar 2007 21:22:38 -0000
@@ -1,9 +1,9 @@
 #! /bin/sh
 
-# bootstrap (GNU M4) version 2006-11-16
+# bootstrap (GNU M4) version 2007-03-24
 # Written by Gary V. Vaughan  <[email protected]>
 
-# Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -316,6 +316,62 @@ case $DOWNLOAD_PO in
   *)    func_update_po $DOWNLOAD_PO ;;
 esac
 
+## ---------------- ##
+## Version control. ##
+## ---------------- ##
+
+# gnulib-tool updates ltdl/m4/.cvsignore and gnu/.cvsignore, and keeping
+# generated files under version control does not make sense.  Prepopulate
+# ltdl/m4's version with generated files not tracked by gnulib-tool.
+if test -f $config_macro_dir/.cvsignore ; then
+  :
+else
+  func_echo "creating initial $config_macro_dir/.cvsignore"
+  cat > $config_macro_dir/.cvsignore <<\EOF
+*~
+.cvsignore
+argz.m4
+codeset.m4
+getopt.m4
+gettext.m4
+glibc2.m4
+glibc21.m4
+gnulib-comp.m4
+iconv.m4
+intdiv0.m4
+intl.m4
+intldir.m4
+intmax.m4
+inttypes-pri.m4
+inttypes_h.m4
+lcmessage.m4
+lib-ld.m4
+lib-link.m4
+lib-prefix.m4
+libtool.m4
+lock.m4
+longdouble.m4
+longlong.m4
+ltdl.m4
+ltoptions.m4
+ltsugar.m4
+ltversion.m4
+lt~obsolete.m4
+nls.m4
+po.m4
+printf-posix.m4
+progtest.m4
+size_max.m4
+stdint_h.m4
+uintmax_t.m4
+ulonglong.m4
+visibility.m4
+wchar_t.m4
+wint_t.m4
+xsize.m4
+EOF
+fi
+
 ## ---------- ##
 ## Autopoint. ##
 ## ---------- ##
Index: m4/output.c
===================================================================
RCS file: /sources/m4/m4/m4/output.c,v
retrieving revision 1.40
diff -u -p -r1.40 output.c
--- m4/output.c	15 Nov 2006 00:45:07 -0000	1.40
+++ m4/output.c	24 Mar 2007 21:22:38 -0000
@@ -1,6 +1,6 @@
 /* GNU m4 -- A simple macro processor
-   Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 1998, 2002, 2004, 2006
-   Free Software Foundation, Inc.
+   Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 1998, 2002, 2004, 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
@@ -135,7 +135,8 @@ threshold_diversion_CB (const void *elt,
 void
 m4_output_init (m4 *context)
 {
-  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;
   m4_set_current_diversion (context, 0);
   output_diversion = &div0;