diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-08-04 21:51:49 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-08-04 21:51:49 (GMT) |
| commit | 81653efeafbc42b87814989c2ebd6ccbf657f014 (patch) | |
| tree | 41a8f9cacf4cd196a5d83a7bcabea22a08d6736a /generic/tkConsole.c | |
| parent | cbdd67c68da15d4b76cccec0eb15feda2763388a (diff) | |
| parent | da9d597e856d8e25317f1a831f0acdcae3b012b5 (diff) | |
| download | tk-81653efeafbc42b87814989c2ebd6ccbf657f014.zip tk-81653efeafbc42b87814989c2ebd6ccbf657f014.tar.gz tk-81653efeafbc42b87814989c2ebd6ccbf657f014.tar.bz2 | |
Merge 8.6
Diffstat (limited to 'generic/tkConsole.c')
| -rw-r--r-- | generic/tkConsole.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/generic/tkConsole.c b/generic/tkConsole.c index 0ab2954..cb2b2e0 100644 --- a/generic/tkConsole.c +++ b/generic/tkConsole.c @@ -824,7 +824,7 @@ InterpreterObjCmd( if ((otherInterp == NULL) || Tcl_InterpDeleted(otherInterp)) { Tcl_SetObjResult(interp, Tcl_NewStringObj( - "no active master interp", -1)); + "no active parent interp", -1)); Tcl_SetErrorCode(interp, "TK", "CONSOLE", "NO_INTERP", NULL); return TCL_ERROR; } @@ -947,7 +947,7 @@ ConsoleDeleteProc( * * ConsoleEventProc -- * - * This event function is registered on the main window of the slave + * This event function is registered on the main window of the child * interpreter. If the user or a running script causes the main window to * be destroyed, then we need to inform the console interpreter by * invoking "::tk::ConsoleExit". |