Merge 8.7. Undo 2 unnecessary signature changes

9 files changed, 19 insertions, 21 deletions

diff --git a/doc/FindExec.3 b/doc/FindExec.3
index 60b2cec..149ef8a 100644
--- a/doc/FindExec.3
+++ b/doc/FindExec.3
@@ -13,7 +13,7 @@ Tcl_FindExecutable, Tcl_GetNameOfExecutable \- identify or return the name of th
 .nf
 \fB#include <tcl.h>\fR
 .sp
-const char *
+void
 \fBTcl_FindExecutable\fR(\fIargv0\fR)
 .sp
 const char *
diff --git a/doc/Panic.3 b/doc/Panic.3
index 881ed2e..53b84da 100644
--- a/doc/Panic.3
+++ b/doc/Panic.3
@@ -18,7 +18,7 @@ void
 void
 \fBTcl_PanicVA\fR(\fIformat\fR, \fIargList\fR)
 .sp
-const char *
+void
 \fBTcl_SetPanicProc\fR(\fIpanicProc\fR)
 .sp
 void
diff --git a/doc/msgcat.n b/doc/msgcat.n
index 74a7020..1384fa8 100644
--- a/doc/msgcat.n
+++ b/doc/msgcat.n
@@ -219,7 +219,7 @@ As an example, the user may prefer French or English text. This may be configure
 .PP
 .VS "TIP 499"
 .TP
-\fB::msgcat:mcloadedlocales subcommand\fR ?\fIlocale\fR?
+\fB::msgcat::mcloadedlocales subcommand\fR ?\fIlocale\fR?
 .
 This group of commands manage the list of loaded locales for packages not setting a package locale.
 .PP
diff --git a/generic/tcl.decls b/generic/tcl.decls
index 3ce653a..7b53db8 100644
--- a/generic/tcl.decls
+++ b/generic/tcl.decls
@@ -514,7 +514,7 @@ declare 143 {
     void Tcl_Finalize(void)
 }
 declare 144 {nostub {Don't use this function in a stub-enabled extension}} {
-    const char *Tcl_FindExecutable(const char *argv0)
+    void Tcl_FindExecutable(const char *argv0)
 }
 declare 145 {
     Tcl_HashEntry *Tcl_FirstHashEntry(Tcl_HashTable *tablePtr,
@@ -813,7 +813,7 @@ declare 229 {
     void Tcl_SetMaxBlockTime(const Tcl_Time *timePtr)
 }
 declare 230 {nostub {Don't use this function in a stub-enabled extension}} {
-    const char *Tcl_SetPanicProc(TCL_NORETURN1 Tcl_PanicProc *panicProc)
+    void Tcl_SetPanicProc(TCL_NORETURN1 Tcl_PanicProc *panicProc)
 }
 declare 231 {
     int Tcl_SetRecursionLimit(Tcl_Interp *interp, int depth)
@@ -2471,13 +2471,13 @@ export {
 	    Tcl_PackageInitProc *initProc, Tcl_PackageInitProc *safeInitProc)
 }
 export {
-    const char *Tcl_SetPanicProc(TCL_NORETURN1 Tcl_PanicProc *panicProc)
+    void Tcl_SetPanicProc(TCL_NORETURN1 Tcl_PanicProc *panicProc)
 }
 export {
     Tcl_ExitProc *Tcl_SetExitProc(TCL_NORETURN1 Tcl_ExitProc *proc)
 }
 export {
-    const char *Tcl_FindExecutable(const char *argv0)
+    void Tcl_FindExecutable(const char *argv0)
 }
 export {
     const char *Tcl_InitStubs(Tcl_Interp *interp, const char *version,
diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index 85c5096..dc39657 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.h
@@ -471,7 +471,7 @@ EXTERN int		Tcl_ExprString(Tcl_Interp *interp, const char *expr);
 /* 143 */
 EXTERN void		Tcl_Finalize(void);
 /* 144 */
-EXTERN const char *	Tcl_FindExecutable(const char *argv0);
+EXTERN void		Tcl_FindExecutable(const char *argv0);
 /* 145 */
 EXTERN Tcl_HashEntry *	Tcl_FirstHashEntry(Tcl_HashTable *tablePtr,
 				Tcl_HashSearch *searchPtr);
@@ -710,7 +710,7 @@ EXTERN void		Tcl_SetErrorCode(Tcl_Interp *interp, ...);
 /* 229 */
 EXTERN void		Tcl_SetMaxBlockTime(const Tcl_Time *timePtr);
 /* 230 */
-EXTERN const char *	Tcl_SetPanicProc(
+EXTERN void		Tcl_SetPanicProc(
 				TCL_NORETURN1 Tcl_PanicProc *panicProc);
 /* 231 */
 EXTERN int		Tcl_SetRecursionLimit(Tcl_Interp *interp, int depth);
@@ -2102,7 +2102,7 @@ typedef struct TclStubs {
     int (*tcl_ExprObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, Tcl_Obj **resultPtrPtr); /* 141 */
     int (*tcl_ExprString) (Tcl_Interp *interp, const char *expr); /* 142 */
     void (*tcl_Finalize) (void); /* 143 */
-    TCL_DEPRECATED_API("Don't use this function in a stub-enabled extension") const char * (*tcl_FindExecutable) (const char *argv0); /* 144 */
+    TCL_DEPRECATED_API("Don't use this function in a stub-enabled extension") void (*tcl_FindExecutable) (const char *argv0); /* 144 */
     Tcl_HashEntry * (*tcl_FirstHashEntry) (Tcl_HashTable *tablePtr, Tcl_HashSearch *searchPtr); /* 145 */
     int (*tcl_Flush) (Tcl_Channel chan); /* 146 */
     TCL_DEPRECATED_API("see TIP #559. Use Tcl_ResetResult") void (*tcl_FreeResult) (Tcl_Interp *interp); /* 147 */
@@ -2196,7 +2196,7 @@ typedef struct TclStubs {
     void (*tcl_SetErrno) (int err); /* 227 */
     void (*tcl_SetErrorCode) (Tcl_Interp *interp, ...); /* 228 */
     void (*tcl_SetMaxBlockTime) (const Tcl_Time *timePtr); /* 229 */
-    TCL_DEPRECATED_API("Don't use this function in a stub-enabled extension") const char * (*tcl_SetPanicProc) (TCL_NORETURN1 Tcl_PanicProc *panicProc); /* 230 */
+    TCL_DEPRECATED_API("Don't use this function in a stub-enabled extension") void (*tcl_SetPanicProc) (TCL_NORETURN1 Tcl_PanicProc *panicProc); /* 230 */
     int (*tcl_SetRecursionLimit) (Tcl_Interp *interp, int depth); /* 231 */
     void (*tcl_SetResult) (Tcl_Interp *interp, char *result, Tcl_FreeProc *freeProc); /* 232 */
     int (*tcl_SetServiceMode) (int mode); /* 233 */
diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index c53cde0..c4ef159 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -1461,16 +1461,14 @@ Tcl_UtfToExternal(
  *---------------------------------------------------------------------------
  */
 #undef Tcl_FindExecutable
-const char *
+void
 Tcl_FindExecutable(
     const char *argv0)		/* The value of the application's argv[0]
 				 * (native). */
 {
-    const char *version = Tcl_InitSubsystems();
-
+    Tcl_InitSubsystems();
     TclpSetInitialEncodings();
     TclpFindExecutable(argv0);
-    return version;
 }
 
 /*
diff --git a/generic/tclPanic.c b/generic/tclPanic.c
index 1fd922b..394661f 100644
--- a/generic/tclPanic.c
+++ b/generic/tclPanic.c
@@ -45,7 +45,7 @@ static TCL_NORETURN1 Tcl_PanicProc *panicProc = NULL;
  *----------------------------------------------------------------------
  */
 
-const char *
+void
 Tcl_SetPanicProc(
     TCL_NORETURN1 Tcl_PanicProc *proc)
 {
@@ -58,7 +58,7 @@ Tcl_SetPanicProc(
     else
 #endif
     panicProc = proc;
-    return Tcl_InitSubsystems();
+    Tcl_InitSubsystems();
 }
 
 /*
diff --git a/generic/tclZipfs.c b/generic/tclZipfs.c
index 8d23b80..cdb7bf3 100644
--- a/generic/tclZipfs.c
+++ b/generic/tclZipfs.c
@@ -4823,12 +4823,12 @@ TclZipfs_AppHook(
 #endif /* _WIN32 */
 {
     const char *archive;
-    const char *version;
+    const char *version = Tcl_InitSubsystems();
 
 #ifdef _WIN32
-    version = Tcl_FindExecutable(NULL);
+    Tcl_FindExecutable(NULL);
 #else
-    version = Tcl_FindExecutable((*argvPtr)[0]);
+    Tcl_FindExecutable((*argvPtr)[0]);
 #endif
     archive = Tcl_GetNameOfExecutable();
     TclZipfs_Init(NULL);
diff --git a/tests/winDde.test b/tests/winDde.test
index c222d79..72f3d92 100644
--- a/tests/winDde.test
+++ b/tests/winDde.test
@@ -14,7 +14,7 @@ if {"::tcltest" ni [namespace children]} {
     namespace import -force ::tcltest::*
 }
 
-testConstraint debug [expr {"debug" in [split [package provide Tcl] .]}]
+testConstraint debug [expr {"debug" in [split [package provide tcl] .]}]
 testConstraint dde 0
 if {[testConstraint win]} {
     if {![catch {