diff options
| author | dgp <dgp@users.sourceforge.net> | 2016-05-10 16:03:13 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2016-05-10 16:03:13 (GMT) |
| commit | 08df07894566ad1a3cf2dc750ab9322761ee400f (patch) | |
| tree | 620e18d988e661349d957eb09da1777d21f4b2f9 /generic/tclObj.c | |
| parent | 20baf86d1e03655bb6d7fae562091e95fe52db15 (diff) | |
| parent | 313d238fb894ff0775f40ec5aee77627742a3b1b (diff) | |
| download | tcl-dgp_dup_encoding_fix.zip tcl-dgp_dup_encoding_fix.tar.gz tcl-dgp_dup_encoding_fix.tar.bz2 | |
merge trunkdgp_dup_encoding_fix
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 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; |