summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Blake <ebb9@byu.net>2006-07-30 21:46:10 +0000
committerEric Blake <ebb9@byu.net>2007-09-21 15:05:42 -0600
commit7b1469952563640d2331be599acf55351670ba75 (patch)
treeac19de66f10dc92a691e403aa2afb25b73f3c731
parent6d60a45c9bd35f02b31404ef961db9c1d9bd8d55 (diff)
downloadm4-7b1469952563640d2331be599acf55351670ba75.tar.gz
* doc/m4.texinfo (Errprint): Add example for last patch.
* checks/check-them): Account for VPATH in latest example.
-rw-r--r--ChangeLog5
-rwxr-xr-xchecks/check-them3
-rw-r--r--doc/m4.texinfo20
3 files changed, 27 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 41bd67f0..b245d87e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-07-30 Eric Blake <ebb9@byu.net>
+
+ * doc/m4.texinfo (Errprint): Add example for last patch.
+ * checks/check-them): Account for VPATH in latest example.
+
2006-07-29 Eric Blake <ebb9@byu.net>
* src/path.c (path_search): Add result parameter, so that
diff --git a/checks/check-them b/checks/check-them
index 0efdd0ce..c846ddc4 100755
--- a/checks/check-them
+++ b/checks/check-them
@@ -54,7 +54,8 @@ do
continue
fi
- sed -e '/^dnl @result{}/!d' -e 's///' "$file" > $xout
+ sed -e '/^dnl @result{}/!d' -e 's///' -e "s|\.\./examples|$examples|" \
+ "$file" > $xout
if cmp -s $out $xout; then
:
diff --git a/doc/m4.texinfo b/doc/m4.texinfo
index 7fa71291..eb772b0f 100644
--- a/doc/m4.texinfo
+++ b/doc/m4.texinfo
@@ -3995,6 +3995,26 @@ errprint(`m4:'__file__:__line__: `input error
@result{}
@end example
+Line numbers start at 1 for each file. If the file was found due to the
+@option{-I} option or @env{M4PATH} environment variable, that is
+reflected in the file name. The syncline option (@option{-s}) uses the
+same notion of current file and line. Assume this example is run in the
+@file{checks} directory of the @acronym{GNU} M4 package, using
+@samp{--include=../examples} in the command line to find the file
+@file{incl.m4} mentioned earlier:
+
+@example
+define(`foo', ``$0' called at __file__:__line__')
+@result{}
+foo
+@result{}foo called at stdin:2
+include(`incl.m4')
+@result{}Include file start
+@result{}foo called at ../examples/incl.m4:2
+@result{}Include file end
+@result{}
+@end example
+
@node M4exit
@section Exiting from @code{m4}