diff options
| author | dgp <dgp@users.sourceforge.net> | 2013-09-08 03:26:12 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2013-09-08 03:26:12 (GMT) |
| commit | a424abd3911d693fafc7c3f49015e39dd8099418 (patch) | |
| tree | 48368319f5b057318530efaa143cff3ce1f8b5c9 /generic | |
| parent | 89d7d04dbc30e04aabc39806f925f51a835889fd (diff) | |
| parent | 53c609c3aa4042d00194dc6d3d2bea553ad9d605 (diff) | |
| download | tcl-a424abd3911d693fafc7c3f49015e39dd8099418.zip tcl-a424abd3911d693fafc7c3f49015e39dd8099418.tar.gz tcl-a424abd3911d693fafc7c3f49015e39dd8099418.tar.bz2 | |
merge 8.5. update changes.
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tclBasic.c | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/generic/tclBasic.c b/generic/tclBasic.c index 314b5fc..c3ab871 100644 --- a/generic/tclBasic.c +++ b/generic/tclBasic.c @@ -1967,7 +1967,8 @@ Tcl_CreateCommand( * * Side effects: * If a command named "cmdName" already exists for interp, it is - * first deleted. Then the new command is created from the arguments. + * first deleted. Then the new command is created from the arguments. + * [***] (See below for exception). * * In the future, during bytecode evaluation when "cmdName" is seen as * the name of a command by Tcl_EvalObj or Tcl_Eval, the object-based @@ -2034,8 +2035,27 @@ Tcl_CreateObjCommand( if (!isNew) { cmdPtr = Tcl_GetHashValue(hPtr); + /* Command already exists. */ + + /* + * [***] This is wrong. See Tcl Bug a16752c252. + * However, this buggy behavior is kept under particular + * circumstances to accommodate deployed binaries of the + * "tclcompiler" program. http://sourceforge.net/projects/tclpro/ + * that crash if the bug is fixed. + */ + + if (cmdPtr->objProc == TclInvokeStringCommand + && cmdPtr->clientData == clientData + && cmdPtr->deleteData == clientData + && cmdPtr->deleteProc == deleteProc) { + cmdPtr->objProc = proc; + cmdPtr->objClientData = clientData; + return (Tcl_Command) cmdPtr; + } + /* - * Command already exists; delete it. Be careful to preserve any + * Otherwise, we delete the old command. Be careful to preserve any * existing import links so we can restore them down below. That way, * you can redefine a command and its import status will remain * intact. |