diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-04-10 16:01:57 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-04-10 16:01:57 (GMT) |
| commit | 426734d48c9a5163b9f82face32180a312eff668 (patch) | |
| tree | 009ebad060e237dccd78ac75f7a5d2fabdb3ae2d /generic/tclObj.c | |
| parent | 76f08ef001dcbb19f756224240d219917ccd98c0 (diff) | |
| parent | 63426502f7ac04dc60ee14a00eb65ad6687ffeef (diff) | |
| download | tcl-426734d48c9a5163b9f82face32180a312eff668.zip tcl-426734d48c9a5163b9f82face32180a312eff668.tar.gz tcl-426734d48c9a5163b9f82face32180a312eff668.tar.bz2 | |
merge trunk
Diffstat (limited to 'generic/tclObj.c')
| -rw-r--r-- | generic/tclObj.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/generic/tclObj.c b/generic/tclObj.c index 61e7352..4640725 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... */ @@ -4177,7 +4177,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; |