* tkcon.tcl (NewSocket, NewDisplay): when nothing is specified,

	just return.
	(Display): fixed connecting to interps on other displays.

diff --git a/ChangeLog b/ChangeLog
index 7912dfdce9efd9e2443a7136fd79fc363746903f..f83d5c197d2cfbf4a5c1a134797669ffd3e32cd8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-08-24  Jeff Hobbs  <jeffh@ActiveState.com>
+
+       * tkcon.tcl (NewSocket, NewDisplay): when nothing is specified,
+       just return.
+       (Display): fixed connecting to interps on other displays.
+
 2001-08-22  Jeff Hobbs  <jeffh@ActiveState.com>
 
        * docs/bindings.html: noted ^r/^s change. 

diff --git a/tkcon.tcl b/tkcon.tcl
index 508472e62679aded23f82a535fbceb6e2172c980..91af6be2434b052fd4c9026aa2f6f721e45c4473 100755 (executable)
--- a/tkcon.tcl
+++ b/tkcon.tcl
@@ -1878,6 +1878,7 @@ proc ::tkcon::NewSocket {} {
     wm withdraw $t
     set host [$t.host get]
     set port [$t.port get]
+    if {$host == ""} { return }
     if {[catch {
        set sock [socket $host $port]
     } err]} {
@@ -2127,20 +2128,16 @@ proc ::tkcon::MainInit {} {
        variable DISP
 
        set res {}
-       if {[string compare {} $disp]} {
-           if {![info exists DISP($disp)]} {
-               return
-           }
+       if {$disp != ""} {
+           if {![info exists DISP($disp)]} { return }
            return [list $DISP($disp) [winfo interps -displayof $DISP($disp)]]
        }
-       foreach d [array names DISP] {
-           lappend res [string range $d 5 end]
-       }
-       return $res
+       return [lsort -dictionary [array names DISP]]
     }
 
     proc ::tkcon::NewDisplay {} {
        variable PRIV
+       variable DISP
 
        set t $PRIV(base).newdisp
        if {![winfo exists $t]} {
@@ -2170,6 +2167,7 @@ proc ::tkcon::MainInit {} {
        grab release $t
        wm withdraw $t
        set disp [$t.data get]
+       if {$disp == ""} { return }
        regsub -all {\.} [string tolower $disp] ! dt
        set dt $PRIV(base).$dt
        destroy $dt