[SCM] GNU M4 source repository branch, branch-1.6, updated. v1.5.89a-16-gf87a1e3

[Eric Blake]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU M4 source repository".

http://git.sv.gnu.org/gitweb/?p=m4.git;a=commitdiff;h=f87a1e3fe98dd9bf9c746f24a0e8d18958c693e3

The branch, branch-1.6 has been updated
       via  f87a1e3fe98dd9bf9c746f24a0e8d18958c693e3 (commit)
       via  21859462376a4b2eedf1f4fc7a3d2de716edee55 (commit)
      from  05528e98e0257bcccbb5001b8ff09293e42d19b6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit f87a1e3fe98dd9bf9c746f24a0e8d18958c693e3
Author: Eric Blake <address@hidden>
Date:   Thu Apr 24 16:27:16 2008 -0600

    Fix debugmode regression from 2008-04-14.
    
    * src/input.c (pop_input): Fix -di output on end of input.
    * doc/m4.texinfo (Debug Levels): Test this behavior.
    (Changeword, Location): Correct examples.
    * checks/check-them (examples): Update to account for recommended
    location for running tests.
    * doc/m4.texinfo (Debug Levels): Test this behavior.
    
    Signed-off-by: Eric Blake <address@hidden>

commit 21859462376a4b2eedf1f4fc7a3d2de716edee55
Author: Eric Blake <address@hidden>
Date:   Thu Apr 24 13:41:36 2008 -0600

    Fix debugmode regression from 2008-02-18.
    
    * src/m4.h (DEBUG_TRACE_VERBOSE): Make -dV verbose again.
    * NEWS: Document this fix.
    
    Test to come when merging stage 23 from branch argv_ref.
    
    Signed-off-by: Eric Blake <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog         |   14 ++++++++++++++
 NEWS              |    4 ++++
 checks/check-them |    6 +++---
 doc/m4.texinfo    |   21 +++++++++++++++++++--
 src/input.c       |    2 +-
 src/m4.h          |    2 +-
 6 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8a29282..1454e02 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2008-04-24  Eric Blake  <address@hidden>
+
+       Fix debugmode regression from 2008-04-14.
+       * src/input.c (pop_input): Fix -di output on end of input.
+       * doc/m4.texinfo (Debug Levels): Test this behavior.
+       (Changeword, Location): Correct examples.
+       * checks/check-them (examples): Update to account for recommended
+       location for running tests.
+       * doc/m4.texinfo (Debug Levels): Test this behavior.
+
+       Fix debugmode regression from 2008-02-18.
+       * src/m4.h (DEBUG_TRACE_VERBOSE): Make -dV verbose again.
+       * NEWS: Document this fix.
+
 2008-04-21  Eric Blake  <address@hidden>
 
        Fix spelling of attribution to Christopher Strachey.
diff --git a/NEWS b/NEWS
index 58fddef..0ca3094 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,10 @@ Foundation, Inc.
    using `builtin' or `indir' to perform nested `shift' calls triggered an
    assertion failure.
 
+** Fix regression introduced in 1.4.10b (but not present in 1.4.11) where
+   the command-line option -dV, as well as the builtin `debugmode(V)',
+   failed to enable `t' and `c' debug options.
+
 ** Fix the `m4wrap' builtin to accumulate wrapped text in FIFO order, as
    required by POSIX.  The manual mentions a way to restore the LIFO order
    present in earlier GNU M4 versions.  NOTE: this change exposes a bug
diff --git a/checks/check-them b/checks/check-them
index 0a697f5..7fba1d6 100755
--- a/checks/check-them
+++ b/checks/check-them
@@ -92,7 +92,7 @@ do
 
   xoutfile=`sed -n 's/^dnl @ expected output: //p' "$file"`
   if test -z "$xoutfile" ; then
-    sed -e '/^dnl @result{}/!d' -e 's///' -e "s|\.\./examples|$examples|" \
+    sed -e '/^dnl @result{}/!d' -e 's///' -e "s|examples/|$examples/|" \
       "$file" > $xout
   else
     cp "$examples/$xoutfile" $xout
@@ -101,10 +101,10 @@ do
   xerrfile=`sed -n 's/^dnl @ expected error: //p' "$file"`
   if test -z "$xerrfile" ; then
     sed '/^dnl @error{}/!d
-         s///; '"s|^m4:|$m4name:|; s|\.\./examples|$examples|" \
+        s///; '"s|^m4:|$m4name:|; s|examples/|$examples/|" \
       "$file" > $xerr
   else
-    sed "s|^m4:|$m4name:|; s|\.\./examples|$examples|" \
+    sed "s|^m4:|$m4name:|; s|examples/|$examples/|" \
       "$examples/$xerrfile" > $xerr
   fi
 
diff --git a/doc/m4.texinfo b/doc/m4.texinfo
index 05b349f..0da6b00 100644
--- a/doc/m4.texinfo
+++ b/doc/m4.texinfo
@@ -3808,6 +3808,23 @@ indir(`echo', defn(`changequote'))
 @result{}
 @end example
 
+This example shows the effects of the debug flags that are not related
+to macro tracing.
+
address@hidden examples
address@hidden options: -dip
address@hidden
+$ @kbd{m4 -dip -I examples}
address@hidden: input read from stdin
+include(`foo')dnl
address@hidden: path search for `foo' found `examples/foo'
address@hidden: input read from examples/foo
address@hidden
address@hidden: input reverted to stdin, line 1
+^D
address@hidden: input exhausted
address@hidden example
+
 @node Debug Output
 @section Saving debugging output
 
@@ -4475,7 +4492,7 @@ define(`bar
 ', defn(`__file__'))
 @result{}
 include(`foo')
address@hidden/examples/foo
address@hidden/foo
 define(`bar
 ', defn(`__line__'))
 @result{}
@@ -6616,7 +6633,7 @@ foo
 @result{}foo called at stdin:2
 include(`incl.m4')
 @result{}Include file start
address@hidden called at ../examples/incl.m4:2
address@hidden called at examples/incl.m4:2
 @result{}Include file end
 @result{}
 @end example
diff --git a/src/input.c b/src/input.c
index e7c819c..aacab61 100644
--- a/src/input.c
+++ b/src/input.c
@@ -657,7 +657,7 @@ pop_input (bool cleanup)
        return false;
       if (debug_level & DEBUG_TRACE_INPUT)
        {
-         if (tmp)
+         if (tmp != &input_eof)
            DEBUG_MESSAGE2 ("input reverted to %s, line %d",
                            tmp->file, tmp->line);
          else
diff --git a/src/m4.h b/src/m4.h
index db531a3..59d9be3 100644
--- a/src/m4.h
+++ b/src/m4.h
@@ -183,7 +183,7 @@ extern FILE *debug;
 #define DEBUG_TRACE_CALLID 0x200
 
 /* V: very verbose --  print everything */
-#define DEBUG_TRACE_VERBOSE 0x377
+#define DEBUG_TRACE_VERBOSE 0x3FF
 /* default flags -- equiv: aeq */
 #define DEBUG_TRACE_DEFAULT 0x007
 


hooks/post-receive
--
GNU M4 source repository