* tkcon.tcl (::tkcon::ExpandVariable): correct array keyname

	expansion. [Bug 1004508] (bold)

diff --git a/ChangeLog b/ChangeLog
index aa4865de9011daf05b4fede83cfd8e7d53c508b1..bbb5bfa67ee948857d45e7d60e32ac41cb2f71b8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-11-17  Jeff Hobbs  <jeffh@ActiveState.com>
+
+       * tkcon.tcl (::tkcon::ExpandVariable): correct array keyname
+       expansion. [Bug 1004508] (bold)
+
 2004-11-12  Jeff Hobbs  <jeffh@ActiveState.com>
 
        * tkcon.tcl (::tkcon::EvalSocket): pass sock arg. (allaert)

diff --git a/tkcon.tcl b/tkcon.tcl
index ab2881e7eecb12cb8209935fccf39f5c0b15da09..166793fc9b238efb793bffce14d632102b2ddd47 100755 (executable)
--- a/tkcon.tcl
+++ b/tkcon.tcl
@@ -5598,7 +5598,9 @@ proc ::tkcon::ExpandVariable str {
            set vars $ary\([ExpandBestMatch $match $str]
            foreach var $match {lappend vars $ary\($var\)}
            return $vars
-       } else {set match $ary\($match\)}
+       } elseif {[llength $match] == 1} {
+           set match $ary\($match\)
+       }
        ## Space transformation avoided for array names.
     } else {
        set match [EvalAttached [list info vars $str*]]