From 63b9112f89a2f6938b767af98c7747fcbc167f2a Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Sun, 10 Apr 2016 15:58:19 +0000 Subject: Fix [07d13d99b0a9]: Who broke TCL 8.6 and Tclblend ? --- generic/tclObj.c | 5 +++-- 1 file 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; -- cgit v0.12