summaryrefslogtreecommitdiffstats
path: root/generic/tclParse.c
diff options
context:
space:
mode:
authormsofer <msofer@noemail.net>2008-07-15 14:13:02 (GMT)
committermsofer <msofer@noemail.net>2008-07-15 14:13:02 (GMT)
commit7572f4cce44908ff955e8ba8e8e37be3fc0478ba (patch)
tree2ac53a2bacc7baa9e1bc62dee292ab3e78ba8080 /generic/tclParse.c
parent90a60491aab9e8e59b2431c174f98626aa014cba (diff)
downloadtcl-7572f4cce44908ff955e8ba8e8e37be3fc0478ba.zip
tcl-7572f4cce44908ff955e8ba8e8e37be3fc0478ba.tar.gz
tcl-7572f4cce44908ff955e8ba8e8e37be3fc0478ba.tar.bz2
* generic/tclParse.c: fixing incomplete reversion of "fix" for
[Bug 2017583], missing TclResetCancellation call. FossilOrigin-Name: 34b2654de3aa23a1e6c8ef64637a70e3f4ce3cc0
Diffstat (limited to 'generic/tclParse.c')
-rw-r--r--generic/tclParse.c3
1 files changed, 2 insertions, 1 deletions
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) {