From: Jeff Hobbs <hobbs@users.sourceforge.net>
Date: Tue, 19 Sep 2000 18:49:29 +0000 (+0000)
Subject: tkcon.tcl: updated v1.2 to v1.3 version, tagged tkcon-1-3
X-Git-Tag: tkcon-1-3
X-Git-Url: http://privyetmir.co.uk/gitweb?a=commitdiff_plain;h=acb80ad87959cd3328ead28630d796f012858435;p=tkcon

tkcon.tcl: updated v1.2 to v1.3 version, tagged tkcon-1-3
---

diff --git a/ChangeLog b/ChangeLog
index 66edd24..58af0fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 2000-09-19  Jeff Hobbs  <hobbs@scriptics.com>
 
+	* tkcon.tcl: updated v1.2 to v1.3 version, tagged tkcon-1-3
 	* tkcon.tcl: updated v1.1 to v1.2 version, tagged tkcon-1-2
 	* tkcon.tcl: updated v1.03 to v1.1 version, tagged tkcon-1-1
 	* tkcon.tcl: updated v1.02 to v1.03 version, tagged tkcon-1-03
diff --git a/tkcon.tcl b/tkcon.tcl
index 07735bd..ca74d92 100755
--- a/tkcon.tcl
+++ b/tkcon.tcl
@@ -122,8 +122,8 @@ set TKCON(WWW) [info exists embed_args]
 	    alias auto_execok clear dir dump echo idebug lremove
 	    tkcon_puts tclindex observe observe_var unalias which
 	}
-	version		1.2
-	release		{26 May 1998}
+	version		1.3
+	release		{27 May 1998}
 	docs		{http://www.cs.uoregon.edu/research/tcl/script/tkcon/}
 	email		{jeff.hobbs@acm.org}
 	root		.
@@ -306,7 +306,7 @@ set TKCON(WWW) [info exists embed_args]
     $slave alias exit exit
     interp eval $slave {
 	catch {rename puts tkcon_tcl_puts}
-	catch {rename gets tkcon_tcl_gets}
+	#catch {rename gets tkcon_tcl_gets}
     }
     foreach cmd $TKCON(slaveprocs) { $slave eval [dump proc $cmd] }
     foreach cmd $TKCON(slavealias) { $slave alias $cmd $cmd }
@@ -352,7 +352,7 @@ set TKCON(WWW) [info exists embed_args]
 	tkConAttach $name $type
 	tkConEvalAttached {
 	    catch {rename puts tkcon_tcl_puts}
-	    catch {rename gets tkcon_tcl_gets}
+	    #catch {rename gets tkcon_tcl_gets}
 	}
 	foreach cmd $TKCON(slaveprocs) { tkConEvalAttached [dump proc $cmd] }
 	switch -exact $type {
@@ -2665,7 +2665,7 @@ proc dir {args} {
     } else {
 	foreach o $out {
 	    set d [lindex $o 0]
-	    append res $d:\n
+	    append res "$d:\n"
 	    set i 0
 	    foreach f [lindex $o 1] {
 		if {[string len [file tail $f]] > $i} {
@@ -3498,10 +3498,11 @@ if {[info tclversion] > 8.0} {;
     } else {
 	if {[llength $m] > 1} {
 	    global tcl_platform
-	    if {[string match windows $tcl_platform(platform)]} {
+	    if {[string match windows $tcl_platform(platform)] \
+		&& [string compare "Windows NT" $tcl_platform(os)]} {
 		## Windows is screwy because it's case insensitive
 		set tmp [tkConExpandBestMatch [string tolower $m] \
-			[string tolow [file tail $str]]]
+			[string tolower [file tail $str]]]
 	    } else {
 		set tmp [tkConExpandBestMatch $m [file tail $str]]
 	    }
@@ -3789,7 +3790,7 @@ if {[string compare [info command toplevel] toplevel]} {
 		"[list $i] eval [list [lindex $args 1]]"]
     }
     set code [catch "bind $w $args" msg]
-    if {[llength $args] <2 && code == 0} {
+    if {[llength $args] <2 && $code == 0} {
 	set msg [lindex $msg 3]
     }
     return -code $code $msg