diff options
| author | dgp <dgp@users.sourceforge.net> | 2007-07-05 18:03:44 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2007-07-05 18:03:44 (GMT) |
| commit | b72d91bd10dfec0ff66a2bdc8d79d9b7de67dc98 (patch) | |
| tree | 33aa64cb31ab43146bf30d021269ec1f1aa8b1c7 | |
| parent | 699e0abdd1f9687bdda33420a941f8217d88c18c (diff) | |
| download | tcl-b72d91bd10dfec0ff66a2bdc8d79d9b7de67dc98.zip tcl-b72d91bd10dfec0ff66a2bdc8d79d9b7de67dc98.tar.gz tcl-b72d91bd10dfec0ff66a2bdc8d79d9b7de67dc98.tar.bz2 | |
* library/init.tcl (unknown): Corrected inconsistent error message
in interactive [unknown] when empty command is invoked. [Bug 1743676]
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | library/init.tcl | 23 |
2 files changed, 16 insertions, 12 deletions
@@ -1,3 +1,8 @@ +2007-07-05 Don Porter <dgp@users.sourceforge.net> + + * library/init.tcl (unknown): Corrected inconsistent error message + in interactive [unknown] when empty command is invoked. [Bug 1743676] + 2007-06-30 Donal K. Fellows <donal.k.fellows@man.ac.uk> * generic/tclBinary.c (Tcl_BinaryObjCmd): De-fang an instance of the diff --git a/library/init.tcl b/library/init.tcl index 8105642..be02fa1 100644 --- a/library/init.tcl +++ b/library/init.tcl @@ -3,7 +3,7 @@ # Default system startup file for Tcl-based applications. Defines # "unknown" procedure and auto-load facilities. # -# RCS: @(#) $Id: init.tcl,v 1.55.2.6 2005/07/22 21:59:40 dgp Exp $ +# RCS: @(#) $Id: init.tcl,v 1.55.2.7 2007/07/05 18:03:45 dgp Exp $ # # Copyright (c) 1991-1993 The Regents of the University of California. # Copyright (c) 1994-1996 Sun Microsystems, Inc. @@ -312,19 +312,18 @@ proc unknown args { "error in unknown while checking if \"$name\" is\ a unique command abbreviation:\n$msg" } - # Handle empty $name separately due to strangeness in [string first] - if {$name eq ""} { - if {[llength $candidates] != 1} { - return -code error "empty command name \"\"" - } - return [uplevel 1 [lreplace $args 0 0 [lindex $candidates 0]]] - } # Filter out bogus matches when $name contained # a glob-special char [Bug 946952] - set cmds [list] - foreach x $candidates { - if {[string first $name $x] == 0} { - lappend cmds $x + if {$name eq ""} { + # Handle empty $name separately due to strangeness + # in [string first] (See RFE 1243354) + set cmds $candidates + } else { + set cmds [list] + foreach x $candidates { + if {[string first $name $x] == 0} { + lappend cmds $x + } } } if {[llength $cmds] == 1} { |