summaryrefslogtreecommitdiffstats
path: root/generic/tclBasic.c
diff options
context:
space:
mode:
authorkjnash <k.j.nash@usa.net>2020-08-11 18:23:18 (GMT)
committerkjnash <k.j.nash@usa.net>2020-08-11 18:23:18 (GMT)
commit17058912aa60f6a98953579de27b7876ce1ec4dd (patch)
tree51d0b47799e0221f5a9ec3e65eb4145c68288cf2 /generic/tclBasic.c
parentc890584ff70ab28383f53c477a63e4d9189dd113 (diff)
parentb3f8c269fa4910edabe381bf6ec17ecdb2bb19e1 (diff)
downloadtcl-17058912aa60f6a98953579de27b7876ce1ec4dd.zip
tcl-17058912aa60f6a98953579de27b7876ce1ec4dd.tar.gz
tcl-17058912aa60f6a98953579de27b7876ce1ec4dd.tar.bz2
Merge 8.7
Diffstat (limited to 'generic/tclBasic.c')
-rw-r--r--generic/tclBasic.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/generic/tclBasic.c b/generic/tclBasic.c
index 566b980..4ee2ca0 100644
--- a/generic/tclBasic.c
+++ b/generic/tclBasic.c
@@ -684,7 +684,7 @@ Tcl_CreateInterp(void)
TclRegisterCommandTypeName(TclEnsembleImplementationCmd, "ensemble");
TclRegisterCommandTypeName(TclAliasObjCmd, "alias");
TclRegisterCommandTypeName(TclLocalAliasObjCmd, "alias");
- TclRegisterCommandTypeName(TclSlaveObjCmd, "slave");
+ TclRegisterCommandTypeName(TclSlaveObjCmd, "interp");
TclRegisterCommandTypeName(TclInvokeImportedCmd, "import");
TclRegisterCommandTypeName(TclOOPublicObjectCmd, "object");
TclRegisterCommandTypeName(TclOOPrivateObjectCmd, "privateObject");
@@ -3617,6 +3617,7 @@ Tcl_DeleteCommandFromToken(
* TclNRExecuteByteCode looks up the command in the command hashtable).
*/
+ cmdPtr->flags |= CMD_DEAD;
TclCleanupCommandMacro(cmdPtr);
return 0;
}
@@ -4686,7 +4687,7 @@ EvalObjvCore(
* Caller gave it to us.
*/
- if (!(preCmdPtr->flags & CMD_IS_DELETED)) {
+ if (!(preCmdPtr->flags & CMD_DEAD)) {
/*
* So long as it exists, use it.
*/