merge 8.7 (interim fix for [9889f96f4da77e3b])

1 files changed, 3 insertions, 5 deletions

diff --git a/library/init.tcl b/library/init.tcl
index 1209619..7190e95 100644
--- a/library/init.tcl
+++ b/library/init.tcl
@@ -109,17 +109,15 @@ if {[interp issafe]} {
 
     # Set up the 'clock' ensemble
 
-    proc clock args {
+    apply {{} {
 	set cmdmap [dict create]
 	foreach cmd {add clicks format microseconds milliseconds scan seconds} {
 	    dict set cmdmap $cmd ::tcl::clock::$cmd
 	}
 	namespace inscope ::tcl::clock [list namespace ensemble create -command \
-	    [uplevel 1 [list ::namespace origin [::lindex [info level 0] 0]]] \
-	    -map $cmdmap]
+	    ::clock -map $cmdmap]
 	::tcl::unsupported::clock::configure -init-complete
-	uplevel 1 [info level 0]
-    }
+    }}
 }
 
 # Conditionalize for presence of exec.