From: Jeff Hobbs <hobbs@users.sourceforge.net>
Date: Fri, 31 Aug 2001 21:59:34 +0000 (+0000)
Subject: * tkcon.tcl (InitSlave): propagate auto_path from master to slave.
X-Git-Tag: tkcon-2-4~41
X-Git-Url: https://privyetmir.co.uk/gitweb.cgi?a=commitdiff_plain;h=231f2441ce7854720c267a8d515146bd67e0ec7c;p=tkcon

* tkcon.tcl (InitSlave): propagate auto_path from master to slave.
---

diff --git a/ChangeLog b/ChangeLog
index f83d5c1..812b88c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-08-31  Jeff Hobbs  <jeffh@ActiveState.com>
+
+	* tkcon.tcl (InitSlave): propagate auto_path from master to slave.
+
 2001-08-24  Jeff Hobbs  <jeffh@ActiveState.com>
 
 	* tkcon.tcl (NewSocket, NewDisplay): when nothing is specified,
diff --git a/tkcon.tcl b/tkcon.tcl
index 91af6be..4aad6eb 100755
--- a/tkcon.tcl
+++ b/tkcon.tcl
@@ -93,8 +93,7 @@ proc ::tkcon::Init {} {
     variable OPT
     variable COLOR
     variable PRIV
-    global auto_path tcl_platform env tcl_pkgPath \
-	    argc argv tcl_interactive errorInfo
+    global tcl_platform env argc argv tcl_interactive errorInfo
 
     if {![info exists argv]} {
 	set argv {}
@@ -274,12 +273,12 @@ proc ::tkcon::Init {} {
     }
 
     if {[info exists env(TK_CON_LIBRARY)]} {
-	uplevel \#0 lappend auto_path $env(TK_CON_LIBRARY)
+	lappend ::auto_path $env(TK_CON_LIBRARY)
     } else {
-	uplevel \#0 lappend auto_path $OPT(library)
+	lappend ::auto_path $OPT(library)
     }
 
-    if {![info exists tcl_pkgPath]} {
+    if {![info exists ::tcl_pkgPath]} {
 	set dir [file join [file dirname [info nameofexec]] lib]
 	if {[llength [info commands @scope]]} {
 	    set dir [file join $dir itcl]
@@ -421,7 +420,7 @@ proc ::tkcon::InitSlave {slave args} {
     variable OPT
     variable COLOR
     variable PRIV
-    global argv0 tcl_interactive tcl_library env
+    global argv0 tcl_interactive tcl_library env auto_path
 
     if {[string match {} $slave]} {
 	return -code error "Don't init the master interpreter, goofball"
@@ -432,7 +431,7 @@ proc ::tkcon::InitSlave {slave args} {
 	$slave alias load SafeLoad $slave
 	$slave alias open SafeOpen $slave
 	$slave alias file file
-	interp eval $slave [dump var -nocomplain tcl_library env]
+	interp eval $slave [dump var -nocomplain tcl_library auto_path env]
 	interp eval $slave { catch {source [file join $tcl_library init.tcl]} }
 	interp eval $slave { catch unknown }
     }
@@ -452,6 +451,7 @@ proc ::tkcon::InitSlave {slave args} {
     }
     if {[info exists argv0]} {interp eval $slave [list set argv0 $argv0]}
     interp eval $slave set tcl_interactive $tcl_interactive \; \
+	    set auto_path [list $auto_path] \; \
 	    set argc [llength $args] \; \
 	    set argv  [list $args] \; {
 	if {![llength [info command bgerror]]} {