Re: problems with makeinfo's macro expansion

[Karl Berry]

      . Zero bytes are inserted after some expansions -- it seems that the
        recent fix (for groff.texinfo) is not complete yet.

I just checked in this fix, let me know if still broken (or other
problems).  I didn't see anything in the groff.texinfo -E output now.

Thanks as usual,
k


--- makeinfo.c.~1.61.~  2004-07-03 05:48:22.000000000 -0700
+++ makeinfo.c  2004-07-11 14:43:41.000000000 -0700
@@ -960,4 +960,6 @@
   if (temp < 0)
     {
+      /* not found, move current position to end of string */
+      input_text_offset = input_text_length;
       if (strcmp (string, "\n") != 0)
         { /* Give a more descriptive feedback, if we are looking for 
address@hidden ''
@@ -970,8 +972,5 @@
                 COMMAND_PREFIX, command);
           else
-            {
-              line_error (_("Expected `%s'"), string);
-              input_text_offset = input_text_length - strlen (string);
-            }
+            line_error (_("Expected `%s'"), string);
           free (end_block);
           return;
@@ -979,7 +978,6 @@
     }
   else
-    input_text_offset = temp;
-
-  input_text_offset += strlen (string);
+    /* found, move current position to after the found string */
+    input_text_offset = temp + strlen (string);
 }