summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Blake <ebb9@byu.net>2008-06-03 14:16:14 -0600
committerEric Blake <ebb9@byu.net>2008-06-03 14:21:02 -0600
commite8a049d48816579cd04d339724779f414077fec3 (patch)
tree9eed967682051f63d62ea1ea7463f6611f366f70
parent50c5eb094704ebfe272b695a89ad35280a40a716 (diff)
downloadm4-e8a049d48816579cd04d339724779f414077fec3.tar.gz
Fix fallout from previous patch.
* doc/m4.texinfo (Builtin): Adjust expected output. Signed-off-by: Eric Blake <ebb9@byu.net>
-rw-r--r--ChangeLog5
-rw-r--r--doc/m4.texinfo17
2 files changed, 20 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index f06aee74..5b2f0ccd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-03 Eric Blake <ebb9@byu.net>
+
+ Fix fallout from previous patch.
+ * doc/m4.texinfo (Builtin): Adjust expected output.
+
2008-06-02 Eric Blake <ebb9@byu.net>
Stage 24c: Improve display of macro names with embedded NUL.
diff --git a/doc/m4.texinfo b/doc/m4.texinfo
index 35407106..1c7e4ef7 100644
--- a/doc/m4.texinfo
+++ b/doc/m4.texinfo
@@ -2792,8 +2792,12 @@ builtin(`builtin')
builtin(`builtin',)
@error{}m4:stdin:4: Warning: builtin: undefined builtin `'
@result{}
+builtin(`builtin', ``'
+')
+@error{}m4:stdin:5: Warning: builtin: undefined builtin ``\'\n'
+@result{}
indir(`index')
-@error{}m4:stdin:5: Warning: index: too few arguments: 0 < 2
+@error{}m4:stdin:7: Warning: index: too few arguments: 0 < 2
@result{}0
@end example
@@ -2850,10 +2854,19 @@ traceoff
changequote(`[', `]')
@result{}
defn1([foo])
-@error{}m4:stdin:11: Warning: builtin: undefined builtin ``defn''
+@error{}m4:stdin:11: Warning: builtin: undefined builtin ``defn\''
@result{}
defn2([foo])
@result{}bar
+define([defn1], [builtin([defn], $@@)])
+@result{}
+defn1([foo])
+@result{}bar
+changequote
+@result{}
+defn1(`foo')
+@error{}m4:stdin:16: Warning: builtin: undefined builtin `[defn]'
+@result{}
@end example
@node M4symbols