* tkcon.tcl (::tkcon::Bindings): prevent Expand virtual events

	from triggering follow-on events (most important for <Tab>).
	(::tkcon::Retrieve): remove extraneous http::geturl call.

diff --git a/ChangeLog b/ChangeLog
index 70c5eeb54387ff59d22de05bd944000e83c30263..12a05fc3f3a703e70ec7087ab1e9596fc88b4326 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-02-07  Jeff Hobbs  <jeffh@ActiveState.com>
+
+       * tkcon.tcl (::tkcon::Bindings): prevent Expand virtual events
+       from triggering follow-on events (most important for <Tab>).
+       (::tkcon::Retrieve): remove extraneous http::geturl call.
+       
 2007-06-22  Jeff Hobbs  <jeffh@ActiveState.com>
 
        * tkcon.tcl (::tkcon::EvalCmd): add OPT(resultfilter) and 'tkcon
@@ -7,7 +13,7 @@
        Ensure that initial files are sources at level #0.
        Convert args after (--|-argv|-args) into slave arguments and set
        them as the main $::argv/$::argc for propagation.
-       
+
 2007-06-21  Jeff Hobbs  <jeffh@ActiveState.com>
 
        * docs/tkcon.1.man, docs/tkcon.n.man, docs/tkconrc.5.man (new): 

diff --git a/tkcon.tcl b/tkcon.tcl
index 3ae0fade759892b42844fbe4860161c6146f8510..155727f21a612a16058cbfd0ffcff18178bcc431 100755 (executable)
--- a/tkcon.tcl
+++ b/tkcon.tcl
@@ -992,7 +992,7 @@ proc ::tkcon::EvalCmd {w cmd} {
            # Run any user defined result filter command.  The command is
            # passed result code and data.
            if {[llength $OPT(resultfilter)]} {
-               set cmd [concat $OPT(resultfilter) [list $code $res]]
+               set cmd [linsert $OPT(resultfilter) end $code $res]
                if {[catch {EvalAttached $cmd} res2]} {
                    $w insert output "Filter failed: $res2" stderr \n stdout
                } else {
@@ -5184,16 +5184,19 @@ proc ::tkcon::Bindings {} {
 
     bind TkConsole <<TkCon_ExpandFile>> {
        if {[%W compare insert > limit]} {::tkcon::Expand %W path}
-       break
+       break ; # could check "%K" == "Tab"
     }
     bind TkConsole <<TkCon_ExpandProc>> {
        if {[%W compare insert > limit]} {::tkcon::Expand %W proc}
+       break ; # could check "%K" == "Tab"
     }
     bind TkConsole <<TkCon_ExpandVar>> {
        if {[%W compare insert > limit]} {::tkcon::Expand %W var}
+       break ; # could check "%K" == "Tab"
     }
     bind TkConsole <<TkCon_Expand>> {
        if {[%W compare insert > limit]} {::tkcon::Expand %W}
+       break ; # could check "%K" == "Tab"
     }
     bind TkConsole <<TkCon_Tab>> {
        if {[%W compare insert >= limit]} {
@@ -6142,7 +6145,6 @@ proc ::tkcon::Retrieve {} {
        }
        set token [::http::geturl $PRIV(HEADURL) \
                -headers $headers -timeout 30000]
-       set token [::http::geturl $PRIV(HEADURL) -timeout 30000]
        ::http::wait $token
        set code [catch {
            set ncode [::http::ncode $token]
@@ -6176,7 +6178,7 @@ proc ::tkcon::Retrieve {} {
        if {$code == 2} {
            tk_messageBox -type ok -icon info -parent $PRIV(root) \
                    -title "Failed to retrieve source" \
-                   -message "Failed to retrieve latest tkcon source:\n$err"
+                   -message "Failed to retrieve latest tkcon source:\n$err\n$PRIV(HEADURL)"
        } elseif {$code} {
            return -code error $err
        } else {