summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhobbs <hobbs>2005-11-30 01:22:55 (GMT)
committerhobbs <hobbs>2005-11-30 01:22:55 (GMT)
commitfca91e92abed73725a55611475b3814d3b19e541 (patch)
tree59de9d3e00394bf5f4a85bbccc4d0e25cb2206a1
parent12e3724cff854097e33aacfde2f9d8ae89ad8b06 (diff)
downloadtk-fca91e92abed73725a55611475b3814d3b19e541.zip
tk-fca91e92abed73725a55611475b3814d3b19e541.tar.gz
tk-fca91e92abed73725a55611475b3814d3b19e541.tar.bz2
* library/console.tcl (::tk::ConsoleInit): improve work-around to
avoid '% ' from tclMain.c [Bug 1252259]
-rw-r--r--ChangeLog3
-rw-r--r--library/console.tcl6
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 6330bad..247b9c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2005-11-29 Jeff Hobbs <jeffh@ActiveState.com>
+ * library/console.tcl (::tk::ConsoleInit): improve work-around to
+ avoid '% ' from tclMain.c [Bug 1252259]
+
* macosx/tkMacOSXXStubs.c (TkpOpenDisplay, TkMacOSXDisplayChanged):
* macosx/tkMacOSXCarbonEvents.c (TkMacOSXInitCarbonEvents):
* macosx/tkMacOSXWindowEvent.c (TkMacOSXProcessApplicationEvent):
diff --git a/library/console.tcl b/library/console.tcl
index 041423f..fba7fec 100644
--- a/library/console.tcl
+++ b/library/console.tcl
@@ -4,7 +4,7 @@
# can be used by non-unix systems that do not have built-in support
# for shells.
#
-# RCS: @(#) $Id: console.tcl,v 1.22.2.3 2005/05/31 04:58:00 hobbs Exp $
+# RCS: @(#) $Id: console.tcl,v 1.22.2.4 2005/11/30 01:22:55 hobbs Exp $
#
# Copyright (c) 1995-1997 Sun Microsystems, Inc.
# Copyright (c) 1998-2000 Ajuba Solutions.
@@ -153,7 +153,9 @@ proc ::tk::ConsoleInit {} {
if {$tcl_platform(platform) eq "windows"} {
# Subtle work-around to erase the '% ' that tclMain.c prints out
- after idle [list $con delete 1.0 output]
+ after idle [subst -nocommand {
+ if {[$con get 1.0 output] eq "% "} { $con delete 1.0 output }
+ }]
}
}