summaryrefslogtreecommitdiffstats
path: root/generic/tclParse.c
diff options
context:
space:
mode:
authorMiguel Sofer <miguel.sofer@gmail.com>2008-07-15 14:13:03 (GMT)
committerMiguel Sofer <miguel.sofer@gmail.com>2008-07-15 14:13:03 (GMT)
commit3e3c38e1c4bb7aca9f2180b6b32d16958e78ce7f (patch)
tree2ac53a2bacc7baa9e1bc62dee292ab3e78ba8080 /generic/tclParse.c
parent54f66a3aa6f0297dfa1f6f0775166470a07218ee (diff)
downloadtcl-3e3c38e1c4bb7aca9f2180b6b32d16958e78ce7f.zip
tcl-3e3c38e1c4bb7aca9f2180b6b32d16958e78ce7f.tar.gz
tcl-3e3c38e1c4bb7aca9f2180b6b32d16958e78ce7f.tar.bz2
* generic/tclParse.c: fixing incomplete reversion of "fix" for
[Bug 2017583], missing TclResetCancellation call.
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) {