summaryrefslogtreecommitdiffstats
path: root/share
diff options
context:
space:
mode:
authorKaz Kylheku <kaz@kylheku.com>2018-04-08 07:40:21 -0700
committerKaz Kylheku <kaz@kylheku.com>2018-04-08 07:40:21 -0700
commit10486e76d527cf53786664ecee164d0398b029c9 (patch)
tree219c15feaf5102ef704c708f67310d6e704f9808 /share
parentc02a785e184433ce9b5a14239f29704831a2c95c (diff)
downloadtxr-10486e76d527cf53786664ecee164d0398b029c9.tar.gz
txr-10486e76d527cf53786664ecee164d0398b029c9.tar.bz2
txr-10486e76d527cf53786664ecee164d0398b029c9.zip
trace: refer usr:catch operator rather than sys:catch.
* share/txr/stdlib/trace.tl (sys:trace, sys:untrace): Now that library code is being read in the sys package, catch refers to the sys:catch special form; we want the usr:catch macro here.
Diffstat (limited to 'share')
-rw-r--r--share/txr/stdlib/trace.tl6
1 files changed, 3 insertions, 3 deletions
diff --git a/share/txr/stdlib/trace.tl b/share/txr/stdlib/trace.tl
index 4815ab4f..ca7a78c2 100644
--- a/share/txr/stdlib/trace.tl
+++ b/share/txr/stdlib/trace.tl
@@ -61,7 +61,7 @@
(n [mapcar sys:trace-canonicalize-name names]))
(unless [sys:*trace-hash* n]
(when (neq n orig-n)
- (catch
+ (usr:catch
(throwf 'warning "~s: ~s is actually ~s: tracing that instead"
'trace orig-n n)
(continue ())))
@@ -89,7 +89,7 @@
(let ((prev (del [sys:*trace-hash* name])))
(when prev
(when (neq name-orig name)
- (catch
+ (usr:catch
(throwf 'warning "~s: ~s is actually ~s: untracing that instead"
'trace name-orig name)
(continue ())))
@@ -104,7 +104,7 @@
(defun sys:trace-redefine-check (orig-name)
(let ((name (sys:trace-canonicalize-name orig-name)))
(when [sys:*trace-hash* name]
- (catch
+ (usr:catch
(cond
((neq name orig-name)
(throwf 'warning "~!~s won't be traced, though it overrides\n\