diff options
author | Andy Wingo <wingo@pobox.com> | 2011-12-01 23:31:50 +0100 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2011-12-01 23:31:50 +0100 |
commit | b2208d2e987759270c712e35c8164394a47a52aa (patch) | |
tree | 1edd39e74a266fc53c075d328696e8fbf33eba5b /libguile/vm-i-system.c | |
parent | 3dc9f41900a0e9f915da3aa1eea6e0fae829c40d (diff) | |
parent | 738c899e4c1ab9d25cfbcd1010f34e0cce400bca (diff) | |
download | guile-b2208d2e987759270c712e35c8164394a47a52aa.tar.gz |
Merge remote-tracking branch 'origin/stable-2.0'
Conflicts:
configure.ac
libguile/fluids.c
libguile/gc.c
libguile/gc.h
libguile/objcodes.c
libguile/procprop.c
libguile/vm.c
module/ice-9/psyntax-pp.scm
module/ice-9/psyntax.scm
Diffstat (limited to 'libguile/vm-i-system.c')
-rw-r--r-- | libguile/vm-i-system.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libguile/vm-i-system.c b/libguile/vm-i-system.c index fc4e8bdfe..8981042f8 100644 --- a/libguile/vm-i-system.c +++ b/libguile/vm-i-system.c @@ -1660,6 +1660,8 @@ VM_DEFINE_INSTRUCTION (91, fluid_ref, "fluid-ref", 0, 1, 1) else { SCM val = SCM_SIMPLE_VECTOR_REF (fluids, num); + if (scm_is_eq (val, SCM_UNDEFINED)) + val = SCM_I_FLUID_DEFAULT (*sp); if (SCM_UNLIKELY (scm_is_eq (val, SCM_UNDEFINED))) { finish_args = *sp; |