Merge from mvo-vcell-cleanup-1-branch.

[bpt/guile.git] / libguile / stacks.c

diff --git a/libguile/stacks.c b/libguile/stacks.c
index c43ba9b..63bbda0 100644 (file)
--- a/libguile/stacks.c
+++ b/libguile/stacks.c
@@ -221,9 +221,9 @@ read_frame (scm_debug_frame *dframe,long offset,scm_info_frame *iframe)
 static SCM
 get_applybody ()
 {
-  SCM cell = scm_sym2vcell (scm_sym_apply, SCM_BOOL_F, SCM_BOOL_F);
-  if (SCM_CONSP (cell) && SCM_CLOSUREP (SCM_CDR (cell)))
-    return SCM_CADR (SCM_CODE (SCM_CDR (cell)));
+  SCM var = scm_sym2var (scm_sym_apply, SCM_BOOL_F, SCM_BOOL_F);
+  if (SCM_VARIABLEP (var) && SCM_CLOSUREP (SCM_VARIABLE_REF (var)))
+    return SCM_CADR (SCM_CODE (SCM_VARIABLE_REF (var)));
   else
     return SCM_UNDEFINED;
 }