diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-04-30 21:26:34 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-04-30 21:26:34 (GMT) |
| commit | 3f0d81f1fb6f4583fcc330bc1e9688a65082776c (patch) | |
| tree | 49cdc18cf2f4c66919bc15e5d9ebc1fda80b7d52 /generic | |
| parent | a05abd162d6d3eda86cb3842832225cc89f76864 (diff) | |
| parent | 07290679b626a091bd19a007106a28f5447a56d0 (diff) | |
| download | tk-3f0d81f1fb6f4583fcc330bc1e9688a65082776c.zip tk-3f0d81f1fb6f4583fcc330bc1e9688a65082776c.tar.gz tk-3f0d81f1fb6f4583fcc330bc1e9688a65082776c.tar.bz2 | |
Merge 8.6
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tkMain.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/generic/tkMain.c b/generic/tkMain.c index a712dce..e970d04 100644 --- a/generic/tkMain.c +++ b/generic/tkMain.c @@ -264,8 +264,7 @@ Tk_MainEx( if ((argc >= 3) && (0 == _tcscmp(TEXT("-encoding"), argv[1])) && ('-' != argv[3][0])) { Tcl_Obj *value = NewNativeObj(argv[2]); - Tcl_SetStartupScript(NewNativeObj(argv[3]), - Tcl_GetString(value)); + Tcl_SetStartupScript(NewNativeObj(argv[3]), Tcl_GetString(value)); Tcl_DecrRefCount(value); argc -= 3; i += 3; @@ -292,7 +291,7 @@ Tk_MainEx( } Tcl_SetVar2Ex(interp, "argv0", NULL, appName, TCL_GLOBAL_ONLY); - Tcl_SetVar2Ex(interp, "argc", NULL, Tcl_NewWideIntObj((Tcl_WideInt)argc), TCL_GLOBAL_ONLY); + Tcl_SetVar2Ex(interp, "argc", NULL, Tcl_NewWideIntObj(argc), TCL_GLOBAL_ONLY); argvPtr = Tcl_NewListObj(0, NULL); while (argc--) { @@ -319,7 +318,7 @@ Tk_MainEx( } #endif Tcl_SetVar2Ex(interp, "tcl_interactive", NULL, - Tcl_NewWideIntObj(!path && (is.tty || nullStdin)), TCL_GLOBAL_ONLY); + Tcl_NewBooleanObj(!path && (is.tty || nullStdin)), TCL_GLOBAL_ONLY); /* * Invoke application-specific initialization. |