diff options
| author | dgp <dgp@users.sourceforge.net> | 2004-10-01 00:09:36 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2004-10-01 00:09:36 (GMT) |
| commit | d6413b42a9a474bfa3ed2987ace04c858d3ed986 (patch) | |
| tree | 0f0d1f70b1d1d9e3f12c8a7fb42d46895f085efc | |
| parent | 077b930e79f0eeb5e93737af6821135e05a3e020 (diff) | |
| download | tcl-d6413b42a9a474bfa3ed2987ace04c858d3ed986.zip tcl-d6413b42a9a474bfa3ed2987ace04c858d3ed986.tar.gz tcl-d6413b42a9a474bfa3ed2987ace04c858d3ed986.tar.bz2 | |
Correction to 1038021 bug fix; should only save restore those bits
that get cleared by Tcl_ResetResult() and not more serious things
like DELETED.
| -rw-r--r-- | generic/tclVar.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/generic/tclVar.c b/generic/tclVar.c index 03b005e..a78b3f6 100644 --- a/generic/tclVar.c +++ b/generic/tclVar.c @@ -15,7 +15,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclVar.c,v 1.69.2.7 2004/09/30 22:45:15 dgp Exp $ + * RCS: @(#) $Id: tclVar.c,v 1.69.2.8 2004/10/01 00:09:36 dgp Exp $ */ #include "tclInt.h" @@ -4133,7 +4133,8 @@ CallVarTraces(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 @@ -4257,7 +4258,7 @@ CallVarTraces(iPtr, arrayPtr, varPtr, part1, part2, flags, leaveErrMsg) done: if (code == TCL_OK) { - iPtr->flags = saveErrFlags; + iPtr->flags |= saveErrFlags; } if (code == TCL_ERROR) { if (leaveErrMsg) { |