diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-09-04 13:53:56 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-09-04 13:53:56 (GMT) |
| commit | 71f52ef43250086759c25b7bb44760a9510dd8f1 (patch) | |
| tree | 5a5dc10e4165141fd08f07440f668ef0bc5a6c80 /unix | |
| parent | 1a1f6bb851a8f05fd555d9e28bc01edea61adef5 (diff) | |
| parent | 7fbdc22e15b48b888546a5df320f8d7ffedb78b1 (diff) | |
| download | tk-71f52ef43250086759c25b7bb44760a9510dd8f1.zip tk-71f52ef43250086759c25b7bb44760a9510dd8f1.tar.gz tk-71f52ef43250086759c25b7bb44760a9510dd8f1.tar.bz2 | |
Merge 8.6
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/Makefile.in | 2 | ||||
| -rw-r--r-- | unix/tkUnixWm.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in index 38496f4..b0d2bcf 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -1561,7 +1561,7 @@ rpm: all # # Target to create a proper Tk distribution from information in the -# master source directory. DISTDIR must be defined to indicate where +# top source directory. DISTDIR must be defined to indicate where # to put the distribution. DISTDIR must be an absolute path name. # diff --git a/unix/tkUnixWm.c b/unix/tkUnixWm.c index 5e1ed6c..ad111a1 100644 --- a/unix/tkUnixWm.c +++ b/unix/tkUnixWm.c @@ -3606,7 +3606,7 @@ WmTransientCmd( if (wmPtr->iconFor != NULL) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "can't make \"%s\" a transient, it is an icon for %s", + "can't make \"%s\" a transient: it is an icon for %s", Tcl_GetString(objv[2]), Tk_PathName(wmPtr->iconFor))); Tcl_SetErrorCode(interp, "TK", "WM", "TRANSIENT", "ICON", NULL); return TCL_ERROR; @@ -3619,7 +3619,7 @@ WmTransientCmd( if (wmPtr2->iconFor != NULL) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "can't make \"%s\" a container, it is an icon for %s", + "can't make \"%s\" a container: it is an icon for %s", Tcl_GetString(objv[3]), Tk_PathName(wmPtr2->iconFor))); Tcl_SetErrorCode(interp, "TK", "WM", "TRANSIENT", "ICON", NULL); return TCL_ERROR; @@ -3629,7 +3629,7 @@ WmTransientCmd( w = (TkWindow *)w->wmInfoPtr->masterPtr) { if (w == winPtr) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "can't set \"%s\" as container, would cause management loop", + "can't set \"%s\" as container: would cause management loop", Tk_PathName(masterPtr))); Tcl_SetErrorCode(interp, "TK", "WM", "TRANSIENT", "SELF", NULL); return TCL_ERROR; |