From 2b0bd4b76e50ee9f511c827309e0078efc6f537a Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Thu, 16 Oct 2008 17:04:58 +0000
Subject:         * library/init.tcl:     Revised [unknown] so that it
 carefully         preserves the state of the ::errorInfo and ::errorCode
 variables         at the start of auto-loading and restores that state before
 the         autoloaded command is evaluated.  [Bug 2140628]

---
 library/init.tcl | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/library/init.tcl b/library/init.tcl
index 4fae191..084ddbc 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.114 2008/10/16 16:08:09 dgp Exp $
+# RCS: @(#) $Id: init.tcl,v 1.115 2008/10/16 17:04:58 dgp Exp $
 #
 # Copyright (c) 1991-1993 The Regents of the University of California.
 # Copyright (c) 1994-1996 Sun Microsystems, Inc.
@@ -262,12 +262,15 @@ proc unknown args {
 	    unset UnknownPending
 	}
 	if {$msg} {
-	    unset -nocomplain ::errorCode ::errorInfo
 	    if {[info exists savedErrorCode]} {
 		set ::errorCode $savedErrorCode
+	    } else {
+		unset -nocomplain ::errorCode
 	    }
 	    if {[info exists savedErrorInfo]} {
 		set ::errorInfo $savedErrorInfo
+	    } else {
+		unset -nocomplain ::errorInfo
 	    }
 	    set code [catch {uplevel 1 $args} msg opts]
 	    if {$code ==  1} {
-- 
cgit v0.12