Merge 8.7

8 files changed, 47 insertions, 13 deletions

diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml
index 7ba9e89..29aa98b 100644
--- a/.github/workflows/linux-build.yml
+++ b/.github/workflows/linux-build.yml
@@ -1,5 +1,11 @@
 name: Linux
-on: [push]
+on:
+  push:
+    branches:
+    - "main"
+    - "core-8-branch"
+    tags:
+    - "core-**"
 permissions:
   contents: read
 jobs:
diff --git a/.github/workflows/mac-build.yml b/.github/workflows/mac-build.yml
index a9345a1..462bd92 100644
--- a/.github/workflows/mac-build.yml
+++ b/.github/workflows/mac-build.yml
@@ -1,5 +1,11 @@
 name: macOS
-on: [push]
+on:
+  push:
+    branches:
+    - "main"
+    - "core-8-branch"
+    tags:
+    - "core-**"
 permissions:
   contents: read
 jobs:
diff --git a/.github/workflows/onefiledist.yml b/.github/workflows/onefiledist.yml
index 1f75762..5c90701 100644
--- a/.github/workflows/onefiledist.yml
+++ b/.github/workflows/onefiledist.yml
@@ -1,5 +1,11 @@
 name: Build Binaries
-on: [push]
+on:
+  push:
+    branches:
+    - "main"
+    - "core-8-branch"
+    tags:
+    - "core-**"
 permissions:
   contents: read
 jobs:
diff --git a/.github/workflows/win-build.yml b/.github/workflows/win-build.yml
index ba4e5ba..3809786 100644
--- a/.github/workflows/win-build.yml
+++ b/.github/workflows/win-build.yml
@@ -1,5 +1,11 @@
 name: Windows
-on: [push]
+on:
+  push:
+    branches:
+    - "main"
+    - "core-8-branch"
+    tags:
+    - "core-**"
 permissions:
   contents: read
 env:
diff --git a/generic/tclHistory.c b/generic/tclHistory.c
index 02e15a0..f7d9ec8 100644
--- a/generic/tclHistory.c
+++ b/generic/tclHistory.c
@@ -58,8 +58,9 @@ Tcl_RecordAndEval(
     const char *cmd,		/* Command to record. */
     int flags)			/* Additional flags. TCL_NO_EVAL means only
 				 * record: don't execute command.
-				 * TCL_EVAL_GLOBAL means use Tcl_GlobalEval
-				 * instead of Tcl_Eval. */
+				 * TCL_EVAL_GLOBAL means evaluate the script
+				 * in global variable context instead of the
+				 * current procedure. */
 {
     Tcl_Obj *cmdPtr;
     int result;
diff --git a/generic/tclStringObj.c b/generic/tclStringObj.c
index 7fbf77a..0e47487 100644
--- a/generic/tclStringObj.c
+++ b/generic/tclStringObj.c
@@ -249,7 +249,7 @@ UpdateStringOfUTF16String(
 #endif
 
 #endif
-
+
 /*
  * TCL STRING GROWTH ALGORITHM
  *
@@ -3130,12 +3130,16 @@ AppendPrintfToObjVA(
 
 		break;
 	    }
+	    case 'p':
+		if (sizeof(size_t) == sizeof(Tcl_WideInt)) {
+		    size = 2;
+		}
+		/* FALLTHRU */
 	    case 'c':
 	    case 'i':
 	    case 'u':
 	    case 'd':
 	    case 'o':
-	    case 'p':
 	    case 'x':
 	    case 'X':
 		seekingConversion = 0;
diff --git a/generic/tclStringRep.h b/generic/tclStringRep.h
index ef64d6c..d1863fb 100644
--- a/generic/tclStringRep.h
+++ b/generic/tclStringRep.h
@@ -22,7 +22,7 @@
 /*
  * The following structure is the internal rep for a String object. It keeps
  * track of how much memory has been used and how much has been allocated for
- * the various representations to enable growing and shrinking of 
+ * the various representations to enable growing and shrinking of
  * the String object with fewer mallocs. To optimize string
  * length and indexing operations, this structure also stores the number of
  * code points (independent of encoding form) once that value has been computed.
diff --git a/tests-perf/listPerf.tcl b/tests-perf/listPerf.tcl
index 17f22e9..575c78e 100644
--- a/tests-perf/listPerf.tcl
+++ b/tests-perf/listPerf.tcl
@@ -3,8 +3,9 @@
 #
 # listPerf.tcl --
 #
-#  This file provides performance tests for list operations.
-#
+#  This file provides performance tests for list operations. Run
+#     tclsh listPerf.tcl help
+#  for options.
 # ------------------------------------------------------------------------
 #
 # See the file "license.terms" for information on usage and redistribution
@@ -77,7 +78,9 @@ namespace eval perf::list {
                     break
                 }
                 --* {
-                    error "Unknown option $arg"
+                    puts stderr "Unknown option $arg"
+                    print_usage
+                    exit 1
                 }
                 default {
                     # Remaining will be passed back to the caller
@@ -383,6 +386,8 @@ namespace eval perf::list {
             comment Create a list from two lists - real test of expansion speed
             perf measure [list_describe $len "from a {*}list {*}list"] {list {*}$L {*}$L} [list len [expr {$len/2}]]
         }
+
+        perf destroy
     }
 
     proc lappend_describe {share_mode len num iters} {
@@ -1217,7 +1222,7 @@ namespace eval perf::list {
             set commands [lmap sel $selections {
                 if {$sel eq "help"} {
                     print_usage
-                    continue
+                    exit 0
                 }
                 set cmd ::perf::list::${sel}_perf
                 if {$cmd ni [info commands ::perf::list::*_perf]} {