* tkcon.tcl (::tkcon::DeleteTab): allow for exit code to be passed

	when exit is aliased to DeleteTab. [Bug 1064462]
	(::tkcon::Expect): graphicsSet isn't valid yet

diff --git a/ChangeLog b/ChangeLog
index 8d9f2b081b5c5e6ce6ba384304c5dab9ebef387b..910b7d7e746e3179b0b2b943d099a273e3d719ef 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-11-11  Jeff Hobbs  <jeffh@ActiveState.com>
+
+       * tkcon.tcl (::tkcon::DeleteTab): allow for exit code to be passed
+       when exit is aliased to DeleteTab. [Bug 1064462]
+       (::tkcon::Expect): graphicsSet isn't valid yet
+
 2004-10-10  Jeff Hobbs  <jeffh@ActiveState.com>
 
        * tkcon.tcl (::tkcon::Highlight): use ctext for the 'edit' dialog

diff --git a/tkcon.tcl b/tkcon.tcl
index e4857df17852077c3cfeb29e128fed801e3429d9..27324516731d152246fb07ba1e7aceb7f622e11c 100755 (executable)
--- a/tkcon.tcl
+++ b/tkcon.tcl
@@ -797,7 +797,8 @@ proc ::tkcon::NewTab {{con {}}} {
     GotoTab $con
 }
 
-proc ::tkcon::DeleteTab {{con {}} {slave {}}} {
+# The extra code arg is for the alias of exit to this function
+proc ::tkcon::DeleteTab {{con {}} {slave {}} {code 0}} {
     variable PRIV
 
     set numtabs [llength $PRIV(tabs)]
@@ -3214,10 +3215,12 @@ proc ::tkcon::Expect {cmd} {
            } "^\x1b\\\[KS" {
                # (smkx,ks) start keyboard-transmit mode
                # terminfo invokes these when going in/out of graphics mode
-               graphicsSet 1
+               # In graphics mode, we should have no scrollbars
+               #graphicsSet 1
            } "^\x1b\\\[KE" {
                # (rmkx,ke) end keyboard-transmit mode
-               graphicsSet 0
+               # Out of graphics mode, we should have scrollbars
+               #graphicsSet 0
            }
        }
        }