From 867b2ba591026b6f486b636329810e80b5069077 Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Fri, 1 Oct 2004 00:10:23 +0000
Subject: Correction to 1038021 bug fix;  should only save restore those bits
 that get cleared by Tcl_ResetResult() and not more serious things like
 DELETED.

---
 generic/tclTrace.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/generic/tclTrace.c b/generic/tclTrace.c
index 25dad45..91cd63d 100644
--- a/generic/tclTrace.c
+++ b/generic/tclTrace.c
@@ -11,7 +11,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclTrace.c,v 1.12 2004/09/30 23:06:49 dgp Exp $
+ * RCS: @(#) $Id: tclTrace.c,v 1.13 2004/10/01 00:10:23 dgp Exp $
  */
 
 #include "tclInt.h"
@@ -2450,7 +2450,8 @@ TclCallVarTraces(iPtr, arrayPtr, varPtr, part1, part2, flags, leaveErrMsg)
     int copiedName;
     int code = TCL_OK;
     int disposeFlags = 0;
-    int saveErrFlags = iPtr->flags;
+    int saveErrFlags = iPtr->flags
+	    & (ERR_IN_PROGRESS | ERR_ALREADY_LOGGED | ERROR_CODE_SET);
 
     /*
      * If there are already similar trace procedures active for the
@@ -2574,7 +2575,7 @@ TclCallVarTraces(iPtr, arrayPtr, varPtr, part1, part2, flags, leaveErrMsg)
 
     done:
     if (code == TCL_OK) {
-	iPtr->flags = saveErrFlags;
+	iPtr->flags |= saveErrFlags;
     }
     if (code == TCL_ERROR) {
 	if (leaveErrMsg) {
-- 
cgit v0.12