FYI: 3-gary-macro.c-format.patch

[Gary V. Vaughan]

Applied to HEAD.
--
  ())_. Gary V. Vaughan     gary@(oranda.demon.co.uk|gnu.org)
  ( '/  Research Scientist  http://www.oranda.demon.co.uk       ,_())____
  / )=  GNU Hacker          http://www.gnu.org/software/libtool  \'      `&
`(_~)_  Tech' Author        http://sources.redhat.com/autobook   =`---d__/

Index: ChangeLog
from  Gary V. Vaughan  <address@hidden>

        * m4/macro.c: Format changes.

Index: m4/macro.c
===================================================================
RCS file: /cvsroot/m4/m4/m4/macro.c,v
retrieving revision 1.21
diff -u -p -r1.21 macro.c
--- m4/macro.c  19 Oct 2001 09:43:51 -0000      1.21
+++ m4/macro.c  5 Jun 2003 16:05:10 -0000
@@ -46,7 +46,7 @@ m4_expand_input (void)
 
 
 /* Expand one token, according to its type.  Potential macro names
-   (TOKEN_WORD) are looked up in the symbol table, to see if they have a
+   (M4_TOKEN_WORD) are looked up in the symbol table, to see if they have a
    macro definition.  If they have, they are expanded as macros, otherwise
    the text are just copied to the output.  */
 static void
@@ -75,13 +75,13 @@ expand_token (struct obstack *obs, m4_to
          ++p;
 
        symbol = m4_symbol_lookup (p);
-       if (symbol == NULL || SYMBOL_TYPE (symbol) == M4_TOKEN_VOID
+       if (symbol == NULL
+           || SYMBOL_TYPE (symbol) == M4_TOKEN_VOID
            || (SYMBOL_TYPE (symbol) == M4_TOKEN_FUNC
                && BIT_TEST (SYMBOL_FLAGS (symbol), TOKEN_BLIND_ARGS_BIT)
-               && !M4_IS_OPEN(m4_peek_input ())))
+               && !M4_IS_OPEN (m4_peek_input ())))
          {
-           m4_shipout_text (obs, TOKEN_TEXT (td),
-                            strlen (TOKEN_TEXT (td)));
+           m4_shipout_text (obs, text, strlen (text));
          }
        else
          expand_macro (p, symbol);