summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2016-04-10 15:58:19 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2016-04-10 15:58:19 (GMT)
commit63b9112f89a2f6938b767af98c7747fcbc167f2a (patch)
treeea3eb84fee073f14e09fb315262a9b121632d254
parentdaaf750d95e22d23e47f846f89b0d7033b4eb0bd (diff)
downloadtcl-63b9112f89a2f6938b767af98c7747fcbc167f2a.zip
tcl-63b9112f89a2f6938b767af98c7747fcbc167f2a.tar.gz
tcl-63b9112f89a2f6938b767af98c7747fcbc167f2a.tar.bz2
Fix [07d13d99b0a9]: Who broke TCL 8.6 and Tclblend ?
-rw-r--r--generic/tclObj.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/generic/tclObj.c b/generic/tclObj.c
index c641152..628c3a7 100644
--- a/generic/tclObj.c
+++ b/generic/tclObj.c
@@ -320,7 +320,7 @@ const Tcl_HashKeyType tclObjHashKeyType = {
* does allow them to delete a command when references to it are gone, which
* is fragile but useful given their somewhat-OO style. Because of this, this
* structure MUST NOT be const so that the C compiler puts the data in
- * writable memory. [Bug 2558422]
+ * writable memory. [Bug 2558422] [Bug 07d13d99b0a9]
* TODO: Provide a better API for those extensions so that they can coexist...
*/
@@ -4176,7 +4176,8 @@ Tcl_GetCommandFromObj(
* had is invalid one way or another.
*/
- if (SetCmdNameFromAny(interp, objPtr) != TCL_OK) {
+ /* See [] why we cannot call SetCmdNameFromAny() directly here. */
+ if (tclCmdNameType.setFromAnyProc(interp, objPtr) != TCL_OK) {
return NULL;
}
resPtr = objPtr->internalRep.twoPtrValue.ptr1;