diff options
author | Andy Wingo <wingo@pobox.com> | 2012-05-23 12:38:56 +0200 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2012-05-23 12:38:56 +0200 |
commit | 747747ee06ac64c224b91e8f64f810a1159c1675 (patch) | |
tree | dcbbde402e06dc2ae70d036c6d474c43c87b031e /libguile/vm.c | |
parent | 4df52c924dad7c7450dea61186b0820b5da844d1 (diff) | |
parent | 2de74cb56e3af44ce624638facfa061603d39c0d (diff) | |
download | guile-747747ee06ac64c224b91e8f64f810a1159c1675.tar.gz |
Merge remote-tracking branch 'origin/stable-2.0'
This commit removes code that was newly deprecated in stable-2.0.
Conflicts:
libguile/deprecated.c
libguile/deprecated.h
libguile/modules.c
module/ice-9/boot-9.scm
module/ice-9/deprecated.scm
Diffstat (limited to 'libguile/vm.c')
-rw-r--r-- | libguile/vm.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/libguile/vm.c b/libguile/vm.c index 5f8bda1f8..0d9aa4029 100644 --- a/libguile/vm.c +++ b/libguile/vm.c @@ -611,17 +611,10 @@ resolve_variable (SCM what, SCM program_module) { if (SCM_LIKELY (scm_is_symbol (what))) { - if (SCM_LIKELY (scm_is_true (program_module))) - /* might longjmp */ + if (scm_is_true (program_module)) return scm_module_lookup (program_module, what); else - { - SCM v = scm_sym2var (what, SCM_BOOL_F, SCM_BOOL_F); - if (scm_is_false (v)) - scm_misc_error (NULL, "unbound variable: ~S", scm_list_1 (what)); - else - return v; - } + return scm_module_lookup (scm_the_root_module (), what); } else { |