diff options
author | Mark H Weaver <mhw@netris.org> | 2013-07-16 01:33:27 -0400 |
---|---|---|
committer | Mark H Weaver <mhw@netris.org> | 2013-07-16 01:33:27 -0400 |
commit | 28d5d2537c0321643c3b511a2195cd491204e7f2 (patch) | |
tree | 16b46ded431848672722595b87024fb7ffc48142 /doc/ref/api-control.texi | |
parent | 178a40928ab5221f6ce57c5af1067abe30a342b3 (diff) | |
parent | 95ed221785f5b1203e998823455f682c1830498b (diff) | |
download | guile-28d5d2537c0321643c3b511a2195cd491204e7f2.tar.gz |
Merge remote-tracking branch 'origin/stable-2.0'
Conflicts:
libguile/keywords.c
libguile/vm.c
Diffstat (limited to 'doc/ref/api-control.texi')
-rw-r--r-- | doc/ref/api-control.texi | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/ref/api-control.texi b/doc/ref/api-control.texi index f34074ec6..026308cac 100644 --- a/doc/ref/api-control.texi +++ b/doc/ref/api-control.texi @@ -1424,7 +1424,8 @@ Guile) formats using @code{display} and @code{~S} (was @code{system-error} then it should be a list containing the Unix @code{errno} value; If @var{key} is @code{signal} then it should be a list containing the Unix signal number; If -@var{key} is @code{out-of-range} or @code{wrong-type-arg}, +@var{key} is @code{out-of-range}, @code{wrong-type-arg}, +or @code{keyword-argument-error}, it is a list containing the bad value; otherwise it will usually be @code{#f}. @end deffn |