diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | generic/tclParse.c | 3 |
2 files changed, 7 insertions, 1 deletions
@@ -1,3 +1,8 @@ +2008-07-15 Miguel Sofer <msofer@users.sf.net> + + * generic/tclParse.c: fixing incomplete reversion of "fix" for + [Bug 2017583], missing TclResetCancellation call. + 2008-07-15 Donal K. Fellows <dkf@users.sf.net> * generic/tclBasic.c (Tcl_CancelEval): Fix blunder. [Bug 2018603] diff --git a/generic/tclParse.c b/generic/tclParse.c index 269978d..a71c831 100644 --- a/generic/tclParse.c +++ b/generic/tclParse.c @@ -12,7 +12,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclParse.c,v 1.70 2008/07/14 20:29:40 msofer Exp $ + * RCS: @(#) $Id: tclParse.c,v 1.71 2008/07/15 14:13:05 msofer Exp $ */ #include "tclInt.h" @@ -2168,6 +2168,7 @@ TclSubstTokens( Interp *iPtr = (Interp *) interp; /* TIP #280: Transfer line information to nested command */ + TclResetCancellation(interp, 0); iPtr->numLevels++; code = TclInterpReady(interp); if (code == TCL_OK) { |