diff options
| author | Joe Mistachkin <joe@mistachkin.com> | 2008-09-17 02:15:32 (GMT) |
|---|---|---|
| committer | Joe Mistachkin <joe@mistachkin.com> | 2008-09-17 02:15:32 (GMT) |
| commit | 533c45a358ccd733b91eb08bd21db04a7b3be0b7 (patch) | |
| tree | 69acc7653d612a1723a5582852a668156f8f6a17 /generic/tclParse.c | |
| parent | aeeead96a33d9d54f77f6beaa6e10b1bd2a8dd4f (diff) | |
| download | tcl-533c45a358ccd733b91eb08bd21db04a7b3be0b7.zip tcl-533c45a358ccd733b91eb08bd21db04a7b3be0b7.tar.gz tcl-533c45a358ccd733b91eb08bd21db04a7b3be0b7.tar.bz2 | |
* generic/tclParse.c: move TclResetCancellation to be called on
returning to level 0, as opposed to it being called on starting a
substitution at level 0.
Diffstat (limited to 'generic/tclParse.c')
| -rw-r--r-- | generic/tclParse.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/generic/tclParse.c b/generic/tclParse.c index a71c831..787b556 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.71 2008/07/15 14:13:05 msofer Exp $ + * RCS: @(#) $Id: tclParse.c,v 1.72 2008/09/17 02:15:32 mistachkin Exp $ */ #include "tclInt.h" @@ -2168,7 +2168,6 @@ 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) { @@ -2176,6 +2175,7 @@ TclSubstTokens( 0, line); } iPtr->numLevels--; + TclResetCancellation(interp, 0); appendObj = Tcl_GetObjResult(interp); break; } |