summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2016-04-10 16:01:17 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2016-04-10 16:01:17 (GMT)
commit71ae050a680cf5c6999c8a4e2f48dccf157d447b (patch)
tree170ab764833139fef2cc45c21c6370d0b2a3820a
parent9a27611f89f0e7b8a3a75faa7d1682a20aeb4d41 (diff)
parentdcf6957535a81167cf3b55d543873df0b05cdeab (diff)
downloadtcl-71ae050a680cf5c6999c8a4e2f48dccf157d447b.zip
tcl-71ae050a680cf5c6999c8a4e2f48dccf157d447b.tar.gz
tcl-71ae050a680cf5c6999c8a4e2f48dccf157d447b.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..a45a392 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 [07d13d99b0a9] why we cannot call SetCmdNameFromAny() directly here. */
+ if (tclCmdNameType.setFromAnyProc(interp, objPtr) != TCL_OK) {
return NULL;
}
resPtr = objPtr->internalRep.twoPtrValue.ptr1;