diff options
| author | dgp <dgp@users.sourceforge.net> | 2021-05-20 00:52:22 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2021-05-20 00:52:22 (GMT) |
| commit | 584540c922511f7b03dd039bf4e7d09157878635 (patch) | |
| tree | 4086b674d5b1c5a50298b8e7417f33dad258ebab /generic/tclBasic.c | |
| parent | 9cea1455ec0d8bfae73216639af0a8b78f93967c (diff) | |
| parent | 9b49520dc25d320488342097655264f6ac4693cb (diff) | |
| download | tcl-584540c922511f7b03dd039bf4e7d09157878635.zip tcl-584540c922511f7b03dd039bf4e7d09157878635.tar.gz tcl-584540c922511f7b03dd039bf4e7d09157878635.tar.bz2 | |
merge 8.7 (resolve conflicts)
Diffstat (limited to 'generic/tclBasic.c')
| -rw-r--r-- | generic/tclBasic.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/generic/tclBasic.c b/generic/tclBasic.c index cafec69..e5ac9df 100644 --- a/generic/tclBasic.c +++ b/generic/tclBasic.c @@ -3427,15 +3427,14 @@ Tcl_DeleteCommandFromToken( cmdPtr->flags |= CMD_DYING; /* - * Call trace functions for the command being deleted. Then delete its - * traces. + * Call each functions and then delete the trace. */ cmdPtr->nsPtr->refCount++; if (cmdPtr->tracePtr != NULL) { CommandTrace *tracePtr; - /* Note that CallCommandTraces() never frees cmdPtr, that's + /* CallCommandTraces() does not cmdPtr, that's * done just before Tcl_DeleteCommandFromToken() returns */ CallCommandTraces(iPtr,cmdPtr,NULL,NULL,TCL_TRACE_DELETE); |