diff options
| author | dkf <donal.k.fellows@manchester.ac.uk> | 2013-01-28 00:57:04 (GMT) |
|---|---|---|
| committer | dkf <donal.k.fellows@manchester.ac.uk> | 2013-01-28 00:57:04 (GMT) |
| commit | 174560be0971d7eddc16bd56fd6d578186143bac (patch) | |
| tree | ddc0546dab10c8bc2575020750fc67d405b7b617 /generic/tclNamesp.c | |
| parent | 6f6055670dd0d873ec34dcd23ae9f8e282fe60aa (diff) | |
| parent | 2ea70632bbcf5060e5114653d4717480c03c0cee (diff) | |
| download | tcl-174560be0971d7eddc16bd56fd6d578186143bac.zip tcl-174560be0971d7eddc16bd56fd6d578186143bac.tar.gz tcl-174560be0971d7eddc16bd56fd6d578186143bac.tar.bz2 | |
merge trunk
Diffstat (limited to 'generic/tclNamesp.c')
| -rw-r--r-- | generic/tclNamesp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/generic/tclNamesp.c b/generic/tclNamesp.c index 8da4b42..304487b 100644 --- a/generic/tclNamesp.c +++ b/generic/tclNamesp.c @@ -423,7 +423,7 @@ Tcl_PopCallFrame( framePtr->nsPtr = NULL; if (framePtr->tailcallPtr) { - TclSpliceTailcall(interp, framePtr->tailcallPtr); + TclSetTailcall(interp, framePtr->tailcallPtr); } } @@ -1945,7 +1945,7 @@ InvokeImportedNRCmd( ImportedCmdData *dataPtr = clientData; Command *realCmdPtr = dataPtr->realCmdPtr; - ((Interp *) interp)->evalFlags |= TCL_EVAL_REDIRECT; + TclSkipTailcall(interp); return Tcl_NRCmdSwap(interp, (Tcl_Command) realCmdPtr, objc, objv, 0); } |