From 6bad0fe2c0035a1724e85f23cc97a86ca15ae2c0 Mon Sep 17 00:00:00 2001
From: kjnash <k.j.nash@usa.net>
Date: Sun, 26 Jul 2020 02:54:33 +0000
Subject: Fix merge error in library/safe.tcl.  Has effect only if using
 private command safe::DetokPath with interp name that has namespace
 separators.

---
 library/safe.tcl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/safe.tcl b/library/safe.tcl
index 18360ce..b5ee95f 100644
--- a/library/safe.tcl
+++ b/library/safe.tcl
@@ -501,7 +501,7 @@ proc ::safe::InterpSetConfig {slave access_path staticsok nestedok deletehook au
 #    nonsense in both the slave and the master.
 #
 proc ::safe::DetokPath {slave tokenPath} {
-    namespace upvar ::safe S$slave state
+    namespace upvar ::safe [VarName $slave] state
 
     set slavePath {}
     foreach token $tokenPath {
-- 
cgit v0.12