diff options
| author | hobbs <hobbs> | 2002-06-22 08:52:24 (GMT) |
|---|---|---|
| committer | hobbs <hobbs> | 2002-06-22 08:52:24 (GMT) |
| commit | 2038f8889841507abc88c8795373ae3d03a9bd38 (patch) | |
| tree | 2bc62892d034184789301945786fb7369fd0b725 | |
| parent | 3c5010b60bbc7c223c0024984605331c7ff3b7f8 (diff) | |
| download | tk-2038f8889841507abc88c8795373ae3d03a9bd38.zip tk-2038f8889841507abc88c8795373ae3d03a9bd38.tar.gz tk-2038f8889841507abc88c8795373ae3d03a9bd38.tar.bz2 | |
* library/console.tcl: corrected the defaultPrompt substitution
[Bug #553207] and made Tab a default expansion key (like Escape).
| -rw-r--r-- | ChangeLog | 15 | ||||
| -rw-r--r-- | library/console.tcl | 12 |
2 files changed, 14 insertions, 13 deletions
@@ -1,9 +1,14 @@ -2002-06-21 Don Porter <dgp@users.sourceforge.net> +2002-06-22 Jeff Hobbs <jeffh@ActiveState.com> - * unix/Makefile.in: Removed unnecessary dependence of tktest - * unix/tkAppInit.c: executable on the tcltest executable on - Unix. If there are similar dependencies on other platforms, they - can probably be removed as well. [Bug 572134]. + * library/console.tcl: corrected the defaultPrompt substitution + [Bug #553207] and made Tab a default expansion key (like Escape). + +2002-06-21 Don Porter <dgp@users.sourceforge.net> + + * unix/Makefile.in: Removed unnecessary dependence of tktest + * unix/tkAppInit.c: executable on the tcltest executable on + Unix. If there are similar dependencies on other platforms, they + can probably be removed as well. [Bug 572134]. 2002-05-20 Daniel Steffen <das@users.sourceforge.net> diff --git a/library/console.tcl b/library/console.tcl index 396d7d3..8fde7c4 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.8.2.5 2002/03/01 00:03:57 dgp Exp $ +# RCS: @(#) $Id: console.tcl,v 1.8.2.6 2002/06/22 08:52:24 hobbs Exp $ # # Copyright (c) 1998-1999 Scriptics Corp. # Copyright (c) 1995-1997 Sun Microsystems, Inc. @@ -27,9 +27,9 @@ namespace eval ::tk::console { variable defaultPrompt ; # default prompt if tcl_prompt1 isn't used if {$inPlugin} { - set defaultPrompt {subst "[history nextid] % "} + set defaultPrompt {subst {[history nextid] % }} } else { - set defaultPrompt {subst "([file tail [pwd]]) [history nextid] % "} + set defaultPrompt {subst {([file tail [pwd]]) [history nextid] % }} } } @@ -309,6 +309,7 @@ proc tkConsoleBind {w} { <<Console_PrevSearch>> <Control-Key-r> <<Console_NextSearch>> <Control-Key-s> + <<Console_Expand>> <Key-Tab> <<Console_Expand>> <Key-Escape> <<Console_ExpandFile>> <Control-Shift-Key-F> <<Console_ExpandProc>> <Control-Shift-Key-P> @@ -328,11 +329,6 @@ proc tkConsoleBind {w} { bind Console $key {} } - bind Console <Tab> { - tkConsoleInsert %W \t - focus %W - break - } bind Console <<Console_Expand>> { if {[%W compare insert > promptEnd]} {::tk::console::Expand %W} } |