* bin/autom4te.in (&freeze): Use a less likely warning separator

than `nn', so that `nnn' is valid in warnings.
Reported by Steve Huston.

diff --git a/ChangeLog b/ChangeLog
index b7a0e7ed72e742147f96ed3ad1eb89325d772665..54d5f2cd2d782427c3455d5c2e123c423f7d5555 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-10-31  Akim Demaille  <akim@epita.fr>
+
+       * bin/autom4te.in (&freeze): Use a less likely warning separator
+       than `\n\n', so that `\n\n\n' is valid in warnings.
+       Reported by Steve Huston.
+
 2003-10-28  Akim Demaille  <akim@epita.fr>
 
        * Makefile.cfg (local_updates, executable-update): Tweak to be

diff --git a/THANKS b/THANKS
index 93b13bf3136b147f3701e9a60b1460462269c21c..35e5ce70d030afdbc5d1a57754d795be792f5f4e 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -181,8 +181,9 @@ Scott Stanton               stanton@scriptics.com
 Simon Leinen                simon@lia.di.epfl.ch
 Stephen Gildea              filtered@against.spam
 Steve Chamberlain           sac@cygnus.com
-Steven G. Johnson           stevenj@alum.mit.edu
+Steve Huston                shuston@riverace.com
 Steve Robbins               steve@nyongwa.montreal.qc.ca
+Steven G. Johnson           stevenj@alum.mit.edu
 Stu Grossman                grossman@cygnus.com
 Syd Polk                    spolk@cygnus.com
 T.E. Dickey                 dickey@clark.net

diff --git a/bin/autom4te.in b/bin/autom4te.in
index 664c7cd412dfb8b40a24d766d7097a5ddb4d9e59..b9386c4fff7664fcf6a84f0525bcbced5e63c4eb 100644 (file)
--- a/bin/autom4te.in
+++ b/bin/autom4te.in
@@ -992,10 +992,11 @@ handle_m4 ($req, keys %{$req->macro})
   if $force || ! $req->valid;
 
 # Issue the warnings each time autom4te was run.
+my $separator = "\n" . ('-' x 25) . " END OF WARNING " . ('-' x 25) . "\n\n";
 handle_traces ($req, "$tmp/warnings",
-              ('_m4_warn' => "\$1::\$f:\$l::\$2::\$3\n\n"));
-# Warnings are separated by 2 \n.
-for (split (/\n{2,}/, contents ("$tmp/warnings")))
+              ('_m4_warn' => "\$1::\$f:\$l::\$2::\$3$separator"));
+# Swallow excessive newlines.
+for (split (/\n*$separator\n*/o, contents ("$tmp/warnings")))
 {
   # The message looks like:
   # | syntax::input.as:5::ouch