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

diff --git a/ChangeLog b/ChangeLog
index f83d5c197d2cfbf4a5c1a134797669ffd3e32cd8..812b88c608f3e4eb1d088c764ef717f77ae2bf4f 100644 (file)
--- 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 91af6be2434b052fd4c9026aa2f6f721e45c4473..4aad6eb3e0ad0e588a15be01352616970d4cf7c6 100755 (executable)
--- 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]]} {