From f308c17841399bd1ffbbc9603e292e5055c19a52 Mon Sep 17 00:00:00 2001 From: dgp Date: Tue, 30 Nov 2004 20:30:00 +0000 Subject: * library/init.tcl ([unknown]): Restored the save/restore of the variables ::errorCode and ::errorInfo. This is needed when the [::bgerror] command is auto-loaded (as it is by Tk). --- ChangeLog | 4 ++++ library/init.tcl | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index f8fc143..fd66610 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2004-11-30 Don Porter + * library/init.tcl ([unknown]): Restored the save/restore of + the variables ::errorCode and ::errorInfo. This is needed when + the [::bgerror] command is auto-loaded (as it is by Tk). + Patch 976520 reworks several of the details involved with startup/initialization of the Tcl library, focused on the activities of Tcl_FindExecutable(). diff --git a/library/init.tcl b/library/init.tcl index c16e515..7cf784b 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.67 2004/11/03 20:30:21 dgp Exp $ +# RCS: @(#) $Id: init.tcl,v 1.68 2004/11/30 20:30:04 dgp Exp $ # # Copyright (c) 1991-1993 The Regents of the University of California. # Copyright (c) 1994-1996 Sun Microsystems, Inc. @@ -179,6 +179,8 @@ proc unknown args { return -options $opts $result } + set savedErrorCode $::errorCode + set savedErrorInfo $::errorInfo set name [lindex $args 0] if {![info exists auto_noload]} { # @@ -201,6 +203,8 @@ proc unknown args { unset UnknownPending } if {$msg} { + set ::errorCode $savedErrorCode + set ::errorInfo $savedErrorInfo set code [catch {uplevel 1 $args} msg opts] if {$code == 1} { # -- cgit v0.12