* doc/autoconf.texi (Redefined M4 Macros): Add index entries for most

redefined M4 macros to this node.  Document m4_include & m4_sinclude.
Move m4_undefine to alphabetical order.

diff --git a/ChangeLog b/ChangeLog
index 17c8f0cea0c2ad161fc193943066633966dbd3f4..e15f4a28f0839079b415fad7c2fd66da6a4a0fef 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-06-08  Derek Price  <derek@ximbiot.com>
+
+       * doc/autoconf.texi (Redefined M4 Macros): Add index entries for most
+       redefined M4 macros to this node.  Document m4_include & m4_sinclude.
+       Move m4_undefine to alphabetical order.
+
 2005-06-07  Paul Eggert  <eggert@cs.ucla.edu>
 
        * README: Recommend GNU M4 1.4.3 or later.

diff --git a/doc/autoconf.texi b/doc/autoconf.texi
index 0c5ba7ca3c5618a4b3c77331a20dce9b1929061f..7246c69c1c806797833b77588bbd7bbed6109226 100644 (file)
--- a/doc/autoconf.texi
+++ b/doc/autoconf.texi
@@ -8726,6 +8726,27 @@ M4sugar''.
 @node Redefined M4 Macros
 @subsection Redefined M4 Macros
 
+@msindex{builtin}
+@msindex{decr}
+@msindex{define}
+@msindex{dumpdef}
+@msindex{errprint}
+@msindex{esyscmd}
+@msindex{eval}
+@msindex{format}
+@msindex{ifdef}
+@msindex{incr}
+@msindex{index}
+@msindex{indir}
+@msindex{len}
+@msindex{maketemp}
+@msindex{pushdef}
+@msindex{shift}
+@msindex{substr}
+@msindex{syscmd}
+@msindex{sysval}
+@msindex{translit}
+@msindex{undefine}
 With a few exceptions, all the M4 native macros are moved in the
 @samp{m4_} pseudo-namespace, e.g., M4sugar renames @code{define} as
 @code{m4_define} etc.
@@ -8756,17 +8777,11 @@ This macro corresponds to @code{m4exit}.
 This macro corresponds to @code{ifelse}.
 @end defmac
 
-@defmac m4_undefine (@var{macro})
-@msindex{undefine}
-Contrary to the M4 builtin, this macro fails if @var{macro} is not
-defined.  Use
-
-@example
-m4_ifdef([@var{macro}], [m4_undefine([@var{macro}])])
-@end example
-
-@noindent
-to recover the behavior of the builtin.
+@defmac m4_include (@var{file})
+@defmacx m4_sinclude (@var{file})
+@msindex{include}
+@msindex{sinclude}
+Like the M4 builtins, but warn against multiple inclusions of @var{file}.
 @end defmac
 
 @defmac m4_bpatsubst (@var{string}, @var{regexp}, @ovar{replacement})
@@ -8807,6 +8822,19 @@ m4_wrap([foo])
 @end example
 @end defmac
 
+@defmac m4_undefine (@var{macro})
+@msindex{undefine}
+Contrary to the M4 builtin, this macro fails if @var{macro} is not
+defined.  Use
+
+@example
+m4_ifdef([@var{macro}], [m4_undefine([@var{macro}])])
+@end example
+
+@noindent
+to recover the behavior of the builtin.
+@end defmac
+
 @node Evaluation Macros
 @subsection Evaluation Macros