diff options
| author | dgp <dgp@users.sourceforge.net> | 2004-10-25 17:24:29 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2004-10-25 17:24:29 (GMT) |
| commit | a982cad7ac7f927864d62b50b62a961526b15852 (patch) | |
| tree | 04439c9dabfd93c314ca69f45c1840b0e40d8ac4 /generic/tclInterp.c | |
| parent | 75edfbbf9073ea32340ab1a7315f01b8077fd1ba (diff) | |
| download | tcl-a982cad7ac7f927864d62b50b62a961526b15852.zip tcl-a982cad7ac7f927864d62b50b62a961526b15852.tar.gz tcl-a982cad7ac7f927864d62b50b62a961526b15852.tar.bz2 | |
* library/auto.tcl Purged Tcl's script library of all
* library/clock.tcl remaining references to global vars
* library/init.tcl ::errorInfo and ::errorCode.
* generic/tclMain.c (Tcl_Main): Updated to make use of
TclGetReturnOptions instead of ::errorInfo variable.
* generic/tclInterp.c (tclInit): Bug fix. Access dict variables
with [dict get], not array syntax.
Diffstat (limited to 'generic/tclInterp.c')
| -rw-r--r-- | generic/tclInterp.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/generic/tclInterp.c b/generic/tclInterp.c index 51ce8fd..4ee52f6 100644 --- a/generic/tclInterp.c +++ b/generic/tclInterp.c @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclInterp.c,v 1.47 2004/10/15 04:01:32 dgp Exp $ + * RCS: @(#) $Id: tclInterp.c,v 1.48 2004/10/25 17:24:37 dgp Exp $ */ #include "tclInt.h" @@ -84,10 +84,11 @@ static char initScript[] = "if {[info proc tclInit]==\"\"} {\n\ set tcl_library $i\n\ set tclfile [file join $i init.tcl]\n\ if {[file exists $tclfile]} {\n\ - if {![catch {uplevel #0 [list source $tclfile]} msg opt]} {\n\ + if {![catch {uplevel #0 [list source $tclfile]} msg opts]} {\n\ return\n\ } else {\n\ - append errors \"$tclfile: $msg\n$opt(-errorinfo)\n\"\n\ + append errors \"$tclfile: $msg\n\"\n\ + append errors \"[dict get $opts -errorinfo]\n\"\n\ }\n\ }\n\ }\n\ |