summaryrefslogtreecommitdiffstats
path: root/generic
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)
commita47e05b2688ec13628b7ae14686f7119b6f21010 (patch)
tree2ac53a2bacc7baa9e1bc62dee292ab3e78ba8080 /generic
parent98024fc3424aa3fa10c6983bc7e3701dd7bd1f8b (diff)
downloadtcl-a47e05b2688ec13628b7ae14686f7119b6f21010.zip
tcl-a47e05b2688ec13628b7ae14686f7119b6f21010.tar.gz
tcl-a47e05b2688ec13628b7ae14686f7119b6f21010.tar.bz2
* generic/tclParse.c: fixing incomplete reversion of "fix" for
[Bug 2017583], missing TclResetCancellation call.
Diffstat (limited to 'generic')
-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) {