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 /libguile/vm-i-system.c | |
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 'libguile/vm-i-system.c')
-rw-r--r-- | libguile/vm-i-system.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libguile/vm-i-system.c b/libguile/vm-i-system.c index 248db9af0..0973792bd 100644 --- a/libguile/vm-i-system.c +++ b/libguile/vm-i-system.c @@ -697,12 +697,12 @@ VM_DEFINE_INSTRUCTION (50, bind_kwargs, "bind-kwargs", 5, 0, 0) } VM_ASSERT (scm_is_pair (walk) || (kw_and_rest_flags & F_ALLOW_OTHER_KEYS), - vm_error_kwargs_unrecognized_keyword (program)); + vm_error_kwargs_unrecognized_keyword (program, sp[nkw])); nkw++; } else VM_ASSERT (kw_and_rest_flags & F_REST, - vm_error_kwargs_invalid_keyword (program)); + vm_error_kwargs_invalid_keyword (program, sp[nkw])); } NEXT; |