Merge 8.7 core-8-branch

10 files changed, 22 insertions, 11 deletions

diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml
index 41b41d0..acd0433 100644
--- a/.github/workflows/linux-build.yml
+++ b/.github/workflows/linux-build.yml
@@ -35,7 +35,8 @@ jobs:
         # Duplicated from above
         if: ${{ matrix.cfgopt == 'CFLAGS=-m32 CPPFLAGS=-m32 LDFLAGS=-m32 --disable-64bit' }}
         run: |
-          sudo apt install gcc-multilib libc6-dev-i386
+          sudo apt-get update
+          sudo apt-get install gcc-multilib libc6-dev-i386
       - name: Prepare
         run: |
           touch tclStubInit.c tclOOStubInit.c tclOOScript.h
diff --git a/doc/AddErrInfo.3 b/doc/AddErrInfo.3
index c71926b..357b3eb 100644
--- a/doc/AddErrInfo.3
+++ b/doc/AddErrInfo.3
@@ -28,7 +28,7 @@ int
 .sp
 \fBTcl_SetObjErrorCode\fR(\fIinterp, errorObjPtr\fR)
 .sp
-\fBTcl_SetErrorCode\fR(\fIinterp, element, element, ... \fBNULL\fR)
+\fBTcl_SetErrorCode\fR(\fIinterp, element, element, ... \fB(char *)NULL\fR)
 .sp
 \fBTcl_SetErrorCodeVA\fR(\fIinterp, argList\fR)
 .sp
diff --git a/doc/Eval.3 b/doc/Eval.3
index 95bd883..57a67c4 100644
--- a/doc/Eval.3
+++ b/doc/Eval.3
@@ -37,7 +37,7 @@ int
 \fBTcl_GlobalEvalObj\fR(\fIinterp, objPtr\fR)
 .sp
 int
-\fBTcl_VarEval\fR(\fIinterp, part, part, ... \fBNULL\fR)
+\fBTcl_VarEval\fR(\fIinterp, part, part, ... \fB(char *)NULL\fR)
 .sp
 int
 \fBTcl_VarEvalVA\fR(\fIinterp, argList\fR)
diff --git a/doc/SetResult.3 b/doc/SetResult.3
index d3c0d8a..c9ff84c 100644
--- a/doc/SetResult.3
+++ b/doc/SetResult.3
@@ -24,7 +24,7 @@ Tcl_Obj *
 const char *
 \fBTcl_GetStringResult\fR(\fIinterp\fR)
 .sp
-\fBTcl_AppendResult\fR(\fIinterp, result, result, ... , \fBNULL\fR)
+\fBTcl_AppendResult\fR(\fIinterp, result, result, ... , \fB(char *)NULL\fR)
 .sp
 \fBTcl_AppendResultVA\fR(\fIinterp, argList\fR)
 .sp
diff --git a/doc/StringObj.3 b/doc/StringObj.3
index a64788b..7a0ae8f 100644
--- a/doc/StringObj.3
+++ b/doc/StringObj.3
@@ -56,7 +56,7 @@ void
 \fBTcl_AppendObjToObj\fR(\fIobjPtr, appendObjPtr\fR)
 .sp
 void
-\fBTcl_AppendStringsToObj\fR(\fIobjPtr, string, string, ... \fBNULL\fR)
+\fBTcl_AppendStringsToObj\fR(\fIobjPtr, string, string, ... \fB(char *)NULL\fR)
 .sp
 void
 \fBTcl_AppendStringsToObjVA\fR(\fIobjPtr, argList\fR)
diff --git a/doc/chan.n b/doc/chan.n
index b184b00..d78c445 100644
--- a/doc/chan.n
+++ b/doc/chan.n
@@ -337,7 +337,7 @@ was already reached, and 0 otherwise.
 .TP
 \fBchan event \fIchannelName event\fR ?\fIscript\fR?
 .
-Arranges for the given script, called a \fBchannel event hndler\fR, to be
+Arranges for the given script, called a \fBchannel event handler\fR, to be
 called whenever the given event, one of
 .QW \fBreadable\fR
 or
diff --git a/generic/tclIO.c b/generic/tclIO.c
index 3b36457..2293b42 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -6323,7 +6323,7 @@ ReadChars(
     int dstLimit = TCL_UTF_MAX - 1 + toRead * factor / UTF_EXPANSION_FACTOR;
 
     (void) TclGetStringFromObj(objPtr, &numBytes);
-    Tcl_AppendToObj(objPtr, NULL, dstLimit);
+    Tcl_SetObjLength(objPtr, numBytes + dstLimit);
     if (toRead == srcLen) {
 	unsigned int size;
 
diff --git a/library/manifest.txt b/library/manifest.txt
index 5a999f4..988d267 100644
--- a/library/manifest.txt
+++ b/library/manifest.txt
@@ -2,7 +2,6 @@
 # Package manifest for all Tcl packages included in the /library file system
 ###
 apply {{dir} {
-  set ::test [info script]
   set isafe [interp issafe]
   foreach {safe package version file} {
     0 http            2.10b1  {http http.tcl}
diff --git a/tools/tcltk-man2html.tcl b/tools/tcltk-man2html.tcl
index e5580c1..2b35bd8 100755
--- a/tools/tcltk-man2html.tcl
+++ b/tools/tcltk-man2html.tcl
@@ -578,7 +578,7 @@ proc plus-pkgs {type args} {
 ## Set up some special cases. It would be nice if we didn't have them,
 ## but we do...
 ##
-set excluded_pages {}
+set excluded_pages {case menubar pack-old}
 set forced_index_pages {GetDash}
 set process_first_patterns {*/ttk_widget.n */options.n}
 set ensemble_commands {
diff --git a/unix/Makefile.in b/unix/Makefile.in
index a081bb8..3f05a27 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -2326,6 +2326,7 @@ dist: $(UNIX_DIR)/configure $(UNIX_DIR)/tclConfig.h.in $(UNIX_DIR)/tcl.pc.in gen
 	$(INSTALL_DATA_DIR) $(DISTDIR)/tests
 	$(DIST_INSTALL_DATA) $(TOP_DIR)/license.terms $(DISTDIR)/tests
 	$(DIST_INSTALL_DATA) $(TOP_DIR)/tests/*.test $(TOP_DIR)/tests/README \
+		$(TOP_DIR)/tests/*.bench $(TOP_DIR)/tests/*.tar.gz \
 		$(TOP_DIR)/tests/httpd $(TOP_DIR)/tests/*.tcl \
 		$(TOP_DIR)/tests/auto-files.zip $(DISTDIR)/tests
 	@mkdir $(DISTDIR)/tests/auto0
@@ -2341,6 +2342,16 @@ dist: $(UNIX_DIR)/configure $(UNIX_DIR)/tclConfig.h.in $(UNIX_DIR)/tcl.pc.in gen
 		$(DIST_INSTALL_DATA) $(TOP_DIR)/tests/auto0/$$i/*.tm \
 			$(DISTDIR)/tests/auto0/$$i; \
 	    done;
+	@mkdir $(DISTDIR)/tests/zipfiles
+	$(INSTALL_DATA_DIR) $(DISTDIR)/tests/zipfiles
+	$(DIST_INSTALL_DATA) $(TOP_DIR)/tests/zipfiles/*.zip \
+		$(DISTDIR)/tests/zipfiles
+	$(DIST_INSTALL_DATA) $(TOP_DIR)/tests/zipfiles/README \
+		$(DISTDIR)/tests/zipfiles
+	$(DIST_INSTALL_DATA) $(TOP_DIR)/tests/zipfiles/LICENSE-libzip \
+		$(DISTDIR)/tests/zipfiles
+	$(INSTALL_DATA_DIR) $(DISTDIR)/tests-perf
+	$(DIST_INSTALL_DATA) $(TOP_DIR)/tests-perf/*.tcl $(DISTDIR)/tests-perf
 	$(INSTALL_DATA_DIR) $(DISTDIR)/win
 	$(DIST_INSTALL_DATA) $(TOP_DIR)/win/Makefile.in $(DISTDIR)/win
 	$(DIST_INSTALL_DATA) $(TOP_DIR)/win/configure.ac \
@@ -2374,8 +2385,8 @@ dist: $(UNIX_DIR)/configure $(UNIX_DIR)/tclConfig.h.in $(UNIX_DIR)/tcl.pc.in gen
 		$(UNIX_DIR)/dltest/README $(DISTDIR)/unix/dltest
 	$(INSTALL_DATA_DIR) $(DISTDIR)/tools
 	$(DIST_INSTALL_DATA) $(TOOL_DIR)/README $(TOOL_DIR)/*.c $(TOOL_DIR)/*.svg \
-		$(TOOL_DIR)/*.tcl $(TOOL_DIR)/*.bmp \
-		$(TOOL_DIR)/valgrind_suppress $(DISTDIR)/tools
+		$(TOOL_DIR)/*.tcl $(TOOL_DIR)/*.bmp $(TOOL_DIR)/valgrind_suppress \
+		$(TOOL_DIR)/valgrind_check_success $(DISTDIR)/tools
 	chmod 755 $(DISTDIR)/tools/checkLibraryDoc.tcl \
 		$(DISTDIR)/tools/findBadExternals.tcl \
 		$(DISTDIR)/tools/loadICU.tcl \