summaryrefslogtreecommitdiffstats
path: root/eval.c
diff options
context:
space:
mode:
authorKaz Kylheku <kaz@kylheku.com>2016-09-27 06:55:23 -0700
committerKaz Kylheku <kaz@kylheku.com>2016-09-27 06:55:23 -0700
commitb47025c3edc0c7a191398d9ceac089011fc80ea1 (patch)
tree942b74d65781522603a00feafc1b8d8c065a51ea /eval.c
parentf6d726cd185524fef00572b2e18a186926222b29 (diff)
downloadtxr-b47025c3edc0c7a191398d9ceac089011fc80ea1.tar.gz
txr-b47025c3edc0c7a191398d9ceac089011fc80ea1.tar.bz2
txr-b47025c3edc0c7a191398d9ceac089011fc80ea1.zip
Change criterion for *load-path*-relative loading.
* eval.c (load): Do not resolve all relative paths relative to the current *load-path*, only pure relative ones. * match.c (v_load): Likewise. * txr.1: Update doc for @(load)/@(include) and load function.
Diffstat (limited to 'eval.c')
-rw-r--r--eval.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/eval.c b/eval.c
index 463eb7f5..263fa677 100644
--- a/eval.c
+++ b/eval.c
@@ -3347,7 +3347,7 @@ val load(val target)
{
uses_or2;
val parent = or2(load_path, null_string);
- val path = if3(abs_path_p(target),
+ val path = if3(!pure_rel_path_p(target),
target,
cat_str(nappend2(sub_list(split_str(parent, lit("/")),
zero, negone),