* tkcon.tcl (::tkcon::InitSlave): remove tk_library from the

	seeded auto_path.  Do not add OPT(library) to auto_path if it is "".

diff --git a/ChangeLog b/ChangeLog
index f9a4a82e78b9569b593e89cde072f42f45813f65..d8e2a5240d704153675ad26a4dbe3450a48724db 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-11-18  Jeff Hobbs  <jeffh@ActiveState.com>
+
+       * tkcon.tcl (::tkcon::InitSlave): remove tk_library from the
+       seeded auto_path.  Do not add OPT(library) to auto_path if it is "".
+
 2003-11-04  Jeff Hobbs  <jeffh@ActiveState.com>
 
        * tkcon.tcl (::tkcon::EvalSocketClosed): use tk_messageBox instead

diff --git a/tkcon.tcl b/tkcon.tcl
index 6c4ac590121a92974c733f838f1ad19663057846..078f363f7dde0a0c6006004b9153606a72466b41 100755 (executable)
--- a/tkcon.tcl
+++ b/tkcon.tcl
@@ -285,7 +285,7 @@ proc ::tkcon::Init {args} {
 
     if {[info exists env(TK_CON_LIBRARY)]} {
        lappend ::auto_path $env(TK_CON_LIBRARY)
-    } else {
+    } elseif {$OPT(library) != ""} {
        lappend ::auto_path $OPT(library)
     }
 
@@ -431,7 +431,7 @@ proc ::tkcon::InitSlave {slave args} {
     variable OPT
     variable COLOR
     variable PRIV
-    global argv0 tcl_interactive tcl_library env auto_path
+    global argv0 tcl_interactive tcl_library env auto_path tk_library
 
     if {[string match {} $slave]} {
        return -code error "Don't init the master interpreter, goofball"
@@ -442,7 +442,9 @@ 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 auto_path env]
+       interp eval $slave \
+           [list set auto_path [lremove $auto_path $tk_library]]
+       interp eval $slave [dump var -nocomplain tcl_library env]
        interp eval $slave { catch {source [file join $tcl_library init.tcl]} }
        interp eval $slave { catch unknown }
     }
@@ -462,7 +464,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 auto_path [list [lremove $auto_path $tk_library]] \; \
            set argc [llength $args] \; \
            set argv  [list $args] \; {
        if {![llength [info command bgerror]]} {