summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--generic/tclParse.c11
2 files changed, 6 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index ea97cfd..f034a4e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
2008-07-14 Miguel Sofer <msofer@users.sf.net>
- * generic/tclExecute.c: Remove unneeded TclInterpReady call
+ * generic/tclExecute.c: Remove unneeded TclInterpReady calls
+ * generic/tclParse.c:
* generic/tclBasic.c.: Embedded Tcl_Canceled() calls into
* generic/tclExecute.c: TclInterpReady().
diff --git a/generic/tclParse.c b/generic/tclParse.c
index a6abd52..061f9eb 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.68 2008/07/14 01:38:01 msofer Exp $
+ * RCS: @(#) $Id: tclParse.c,v 1.69 2008/07/14 02:09:30 msofer Exp $
*/
#include "tclInt.h"
@@ -2165,12 +2165,9 @@ TclSubstTokens(
break;
case TCL_TOKEN_COMMAND: {
- code = TclInterpReady(interp);
- if (code == TCL_OK) {
- /* TIP #280: Transfer line information to nested command */
- code = TclEvalEx(interp, tokenPtr->start+1, tokenPtr->size-2,
- 0, line);
- }
+ /* TIP #280: Transfer line information to nested command */
+ code = TclEvalEx(interp, tokenPtr->start+1, tokenPtr->size-2,
+ 0, line);
appendObj = Tcl_GetObjResult(interp);
break;
}