Re: popdef(undefined), __m4_version__

[Eric Blake]

Eric Blake <ebb9 <at> byu.net> writes:


> Here's what I'm planning on committing to m4; it adds debugmode(d) as a
> new flag that controls whether dereferencing undefined macros warns, then
> enables the flag by default unless an explicit -d specifies other flags or
> if -E is in effect.  Both conditions for disabling the debugmode(d) flag
> were necessary, so that branch-1.6 of m4.git can once again handle
> autoconf 2.62 out of the box.

In comparing the manual between the three branches, I noticed some minor 
discrepencies.  I'm committing cleanups along these lines:

>From 27fb700bb7d308ff43691d63eb71b107fc0f5634 Mon Sep 17 00:00:00 2001
From: Eric Blake <address@hidden>
Date: Wed, 27 Aug 2008 11:43:47 -0600
Subject: [PATCH] Node renaming in the manual.

* doc/m4.texinfo (Debug Levels): Rename...
(Debugmode): ...to this.  All references changed.
(Debug Output): Rename...
(Debugfile): ...to this.  All references changed.
(Invoking m4): Fix example, now that order of -d matters.

Signed-off-by: Eric Blake <address@hidden>
---
 ChangeLog      |    9 ++++++++
 doc/m4.texinfo |   63 +++++++++++++++++++++++++++----------------------------
 2 files changed, 40 insertions(+), 32 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1b9bbaa..df022df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-08-27  Eric Blake  <address@hidden>
+
+       Node renaming in the manual.
+       * doc/m4.texinfo (Debug Levels): Rename...
+       (Debugmode): ...to this.  All references changed.
+       (Debug Output): Rename...
+       (Debugfile): ...to this.  All references changed.
+       (Invoking m4): Fix example, now that order of -d matters.
+
 2008-08-23  Eric Blake  <address@hidden>
 
        Allow debugmode control over whether defn(undef) warns.
diff --git a/doc/m4.texinfo b/doc/m4.texinfo
index e537c79..8d87cd5 100644
--- a/doc/m4.texinfo
+++ b/doc/m4.texinfo
@@ -201,8 +201,8 @@ Top
 
 * Dumpdef::                     Displaying macro definitions
 * Trace::                       Tracing macro calls
-* Debug Levels::                Controlling debugging output
-* Debug Output::                Saving debugging output
+* Debugmode::                   Controlling debugging options
+* Debugfile::                   Saving debugging output
 
 Input control
 
@@ -540,14 +540,13 @@ Invoking m4
 command line.  The argument @option{--} is a marker to denote the end of
 options.
 
address@hidden FIXME option -d+f only works on head right now...
 With short options, options that do not take arguments may be combined
 into a single command line argument with subsequent options, options
 with mandatory arguments may be provided either as a single command line
 argument or as two arguments, and options with optional arguments must
 be provided as a single argument.  In other words,
 @kbd{m4 -QPDfoo -d a -d+f} is equivalent to
address@hidden -Q -P -D foo -d -d+f -- ./a}, although the latter form is
address@hidden -Q -P -D foo -d ./a -d+f}, although the latter form is
 considered canonical.
 
 With long options, options with mandatory arguments may be provided with
@@ -893,7 +892,7 @@ Debugging options
 @itemx address@hidden@address@hidden|address@hidden@address@hidden
 Set the debug-level according to the flags @var{FLAGS}.  The debug-level
 controls the format and amount of information presented by the debugging
-functions.  @xref{Debug Levels}, for more details on the format and
+functions.  @xref{Debugmode}, for more details on the format and
 meaning of @var{FLAGS}.  If omitted, @var{FLAGS} defaults to
 @samp{+adeq}.  If the option occurs multiple times, @var{FLAGS} starting
 with @samp{-} or @samp{+} are cumulative, while @var{FLAGS} starting
@@ -926,8 +925,8 @@ Debugging options
 Redirect @code{dumpdef} output, debug messages, and trace output to the
 named @var{FILE}.  Warnings, error messages, and @code{errprint} output
 are still printed to standard error.  If unspecified, debug output goes
-to standard error; if empty, debug output is discarded.  @xref{Debug
-Output}, for more details.  The spellings @option{-o} and
+to standard error; if empty, debug output is discarded.
address@hidden, for more details.  The spellings @option{-o} and
 @option{--error-output} are misleading and inconsistent with other
 @acronym{GNU} tools; for now they are silently accepted as synonyms of
 @option{--debugfile}, but in a future version of M4, using them will
@@ -937,7 +936,7 @@ Debugging options
 @itemx address@hidden
 Restrict the size of the output generated by macro tracing to @var{NUM}
 characters per trace line.  If unspecified or zero, output is
-unlimited.  @xref{Debug Levels}, for more details.
+unlimited.  @xref{Debugmode}, for more details.
 
 @item -t @var{NAME}
 @itemx address@hidden
@@ -2184,7 +2183,7 @@ Undefine
 For each argument, remove the macro @var{name}.  The macro names must
 necessarily be quoted, since they will be expanded otherwise.  If an
 argument is not a defined macro, then the @samp{d} debug level controls
-whether a warning is issued (@pxref{Debug Levels}).
+whether a warning is issued (@pxref{Debugmode}).
 
 The expansion of @code{undefine} is void.
 The macro @code{undefine} is recognized only with parameters.
@@ -2220,7 +2219,7 @@ Undefine
 @end example
 
 As of M4 1.6, @code{undefine} can warn if @var{name} is not a macro, by
-using @code{debugmode} (@pxref{Debug Levels}) or the command line option
+using @code{debugmode} (@pxref{Debugmode}) or the command line option
 @option{-d} (@option{--debugmode}, @pxref{Debugging options, , Invoking
 m4}).
 
@@ -2249,7 +2248,7 @@ Defn
 Expands to the @emph{quoted definition} of each @var{name}.  If an
 argument is not a defined macro, the expansion for that argument is
 empty, and the @samp{d} debug level controls whether a warning is issued
-(@pxref{Debug Levels}).
+(@pxref{Debugmode}).
 
 If @var{name} is a user-defined macro, the quoted definition is simply
 the quoted expansion text.  If, instead, @var{name} is a builtin, the
@@ -2416,7 +2415,7 @@ Defn
 @end example
 
 As of M4 1.6, @code{defn} can warn if @var{name} is not a macro, by
-using @code{debugmode} (@pxref{Debug Levels}) or the command line option
+using @code{debugmode} (@pxref{Debugmode}) or the command line option
 @option{-d} (@option{--debugmode}, @pxref{Debugging options, , Invoking
 m4}).  Also, @code{defn} with multiple arguments can join text with
 builtin tokens.  However, when defining a macro via @code{define} or
@@ -2492,7 +2491,7 @@ Pushdef
 the topmost definition can be removed with @code{popdef}.  If there is
 no previous definition, @code{popdef} behaves like @code{undefine}, and
 if there is no definition at all, the @samp{d} debug level controls
-whether a warning is issued (@pxref{Debug Levels}).
+whether a warning is issued (@pxref{Debugmode}).
 
 The expansion of both @code{pushdef} and @code{popdef} is void.
 The macros @code{pushdef} and @code{popdef} are recognized only with
@@ -2566,7 +2565,7 @@ Pushdef
 and @code{defn}.
 
 As of M4 1.6, @code{popdef} can warn if @var{name} is not a macro, by
-using @code{debugmode} (@pxref{Debug Levels}) or the command line option
+using @code{debugmode} (@pxref{Debugmode}) or the command line option
 @option{-d} (@option{--debugmode}, @pxref{Debugging options, , Invoking
 m4}).
 
@@ -2598,7 +2597,7 @@ Indir
 Results in a call to the macro @var{name}, which is passed the rest of
 the arguments @var{args}.  If @var{name} is not defined, the expansion
 is void, and the @samp{d} debug level controls whether a warning is
-issued (@pxref{Debug Levels}).
+issued (@pxref{Debugmode}).
 
 The macro @code{indir} is recognized only with parameters.
 @end deffn
@@ -2692,7 +2691,7 @@ Builtin
 Results in a call to the builtin @var{name}, which is passed the
 rest of the arguments @var{args}.  If @var{name} does not name a
 builtin, the expansion is void, and the @samp{d} debug level controls
-whether a warning is issued (@pxref{Debug Levels}).
+whether a warning is issued (@pxref{Debugmode}).
 
 The macro @code{builtin} is recognized only with parameters.
 @end deffn
@@ -3724,8 +3723,8 @@ Debugging
 @menu
 * Dumpdef::                     Displaying macro definitions
 * Trace::                       Tracing macro calls
-* Debug Levels::                Controlling debugging output
-* Debug Output::                Saving debugging output
+* Debugmode::                   Controlling debugging options
+* Debugfile::                   Saving debugging output
 @end menu
 
 @node Dumpdef
@@ -3744,7 +3743,7 @@ Dumpdef
 the definitions of each @var{name} given.  The output is printed to the
 current debug file (usually standard error), and is sorted by name.  If
 a @var{name} is undefined, the @samp{d} debug level controls whether a
-warning is issued (@pxref{Debug Levels}).
+warning is issued (@pxref{Debugmode}).
 
 The expansion of @code{dumpdef} is void.
 @end deffn
@@ -3782,7 +3781,7 @@ Dumpdef
 @result{}
 @end example
 
address@hidden Levels}, for information on controlling the details of the
address@hidden, for information on controlling the details of the
 display.
 
 @node Trace
@@ -3810,8 +3809,8 @@ Trace
 Whenever a traced macro is called and the arguments have been collected,
 the call is displayed.  If the expansion of the macro call is not void,
 the expansion can be displayed after the call.  The output is printed
-to the current debug file (defaulting to standard error, @pxref{Debug
-Output}).
+to the current debug file (defaulting to standard error,
address@hidden).
 
 @example
 $ @kbd{m4 -d}
@@ -3921,7 +3920,7 @@ Trace
 @result{}0
 @end example
 
address@hidden Levels}, for information on controlling the details of the
address@hidden, for information on controlling the details of the
 display.  The format of the trace output is not specified by
 @acronym{POSIX}, and varies between implementations of @code{m4}.
 
@@ -3931,7 +3930,7 @@ Trace
 it is not possible for @code{builtin} to trace which subsidiary builtin
 it invokes.  If you are worried about tracking all invocations of a
 given builtin, you should also trace @code{builtin}, or enable global
-tracing (the @samp{t} debug level, @pxref{Debug Levels}).
+tracing (the @samp{t} debug level, @pxref{Debugmode}).
 
 @example
 $ @kbd{m4 -d}
@@ -3989,8 +3988,8 @@ Trace
 @end example
 @end ignore
 
address@hidden Debug Levels
address@hidden Controlling debugging output
address@hidden Debugmode
address@hidden Controlling debugging options
 
 @cindex controlling debugging output
 @cindex debugging output, controlling
@@ -4171,7 +4170,7 @@ Debug Levels
 @error{}m4debug: input exhausted
 @end example
 
address@hidden Debug Output
address@hidden Debugfile
 @section Saving debugging output
 
 @cindex saving debugging output
@@ -5224,7 +5223,7 @@ Search Path
 will be searched in order.
 
 If the automatic search for include-files causes trouble, the @samp{p}
-debug flag (@pxref{Debug Levels}) can help isolate the problem.
+debug flag (@pxref{Debugmode}) can help isolate the problem.
 
 @node Diversions
 @chapter Diverting and undiverting output
@@ -6980,7 +6979,7 @@ Location
 @option{-I} option or @env{M4PATH} environment variable, that is
 reflected in the file name.  The syncline option (@option{-s},
 @pxref{Preprocessor features, , Invoking m4}), and the
address@hidden and @samp{l} flags of @code{debugmode} (@pxref{Debug Levels}),
address@hidden and @samp{l} flags of @code{debugmode} (@pxref{Debugmode}),
 also use this notion of current file and line.  Redefining the three
 location macros has no effect on syncline, debug, warning, or error
 message output.
@@ -7467,11 +7466,11 @@ Extensions
 
 @item
 The format of the output from @code{dumpdef} and macro tracing can be
-controlled with @code{debugmode} (@pxref{Debug Levels}).
+controlled with @code{debugmode} (@pxref{Debugmode}).
 
 @item
 The destination of trace and debug output can be controlled with
address@hidden (@pxref{Debug Output}).
address@hidden (@pxref{Debugfile}).
 
 @item
 The @code{maketemp} (@pxref{Mkstemp}) macro behaves like @code{mkstemp},
@@ -7616,7 +7615,7 @@ Incompatibilities
 guaranteed to be reliable, even between different releases of
 @acronym{GNU} M4; however, the intent is that any future changes in
 trace output will only occur under the direction of additional
address@hidden flags (@pxref{Debug Levels}).
address@hidden flags (@pxref{Debugmode}).
 
 @item
 @acronym{POSIX} requires @code{eval} (@pxref{Eval}) to treat all
-- 
1.6.0