Merge 8.7

12 files changed, 228 insertions, 221 deletions

diff --git a/ChangeLog.2001 b/ChangeLog.2001
index 9d6d541..5fdff46 100644
--- a/ChangeLog.2001
+++ b/ChangeLog.2001
@@ -3525,7 +3525,7 @@
 	* generic/tclVar.c (Tcl_UnsetObjCmd): Rewrote argument parser to avoid
 	a read off the end of the argument array that could occur when
 	executing something like [unset -nocomplain] was executed. Improved
-	the error message given when too few arguments are given (-nocomplain
+	the error message given when not enough arguments are given (-nocomplain
 	should obviously be *before* --, not after it) and also modified the
 	test suite to take account of that and the documentation to use the
 	same improvement. [Bug 405769]
diff --git a/generic/tclBasic.c b/generic/tclBasic.c
index 4e2bcb1..88e51be 100644
--- a/generic/tclBasic.c
+++ b/generic/tclBasic.c
@@ -8790,8 +8790,8 @@ MathFuncWrongNumArgs(
 	}
     }
     Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-	    "too %s arguments for math function \"%s\"",
-	    (found < expected ? "few" : "many"), name));
+	    "%s arguments for math function \"%s\"",
+	    (found < expected ? "not enough" : "too many"), name));
     Tcl_SetErrorCode(interp, "TCL", "WRONGARGS", NULL);
 }
 
diff --git a/generic/tclCompCmdsGR.c b/generic/tclCompCmdsGR.c
index 780f7b8..cebd8f5 100644
--- a/generic/tclCompCmdsGR.c
+++ b/generic/tclCompCmdsGR.c
@@ -1064,7 +1064,7 @@ TclCompileLindexCmd(
     int i, idx, numWords = parsePtr->numWords;
 
     /*
-     * Quit if too few args.
+     * Quit if not enough args.
      */
 
     /* TODO: Consider support for compiling expanded args. */
diff --git a/generic/tclCompCmdsSZ.c b/generic/tclCompCmdsSZ.c
index fe661f8..26698a8 100644
--- a/generic/tclCompCmdsSZ.c
+++ b/generic/tclCompCmdsSZ.c
@@ -462,7 +462,7 @@ TclCompileStringInsertCmd(
 	    TCL_INDEX_END, &idx)) {
 
 	/* Nothing useful knowable - cease compile; let it direct eval */
-	return TCL_OK;
+	return TCL_ERROR;
     }
 
     /* Compute and push the string to be inserted */
diff --git a/library/tzdata/Asia/Gaza b/library/tzdata/Asia/Gaza
index 9b73dcc..ae86505 100644
--- a/library/tzdata/Asia/Gaza
+++ b/library/tzdata/Asia/Gaza
@@ -110,7 +110,7 @@ set TZData(:Asia/Gaza) {
     {1395957600 10800 1 EEST}
     {1414098000 7200 0 EET}
     {1427493600 10800 1 EEST}
-    {1445547600 7200 0 EET}
+    {1445551200 7200 0 EET}
     {1458946800 10800 1 EEST}
     {1477692000 7200 0 EET}
     {1490396400 10800 1 EEST}
@@ -118,165 +118,165 @@ set TZData(:Asia/Gaza) {
     {1521846000 10800 1 EEST}
     {1540591200 7200 0 EET}
     {1553810400 10800 1 EEST}
-    {1572040800 7200 0 EET}
-    {1585260000 10800 1 EEST}
-    {1604095200 7200 0 EET}
-    {1616709600 10800 1 EEST}
+    {1572037200 7200 0 EET}
+    {1585346400 10800 1 EEST}
+    {1603490400 7200 0 EET}
+    {1616796000 10800 1 EEST}
     {1635544800 7200 0 EET}
-    {1648159200 10800 1 EEST}
+    {1648245600 10800 1 EEST}
     {1666994400 7200 0 EET}
-    {1680213600 10800 1 EEST}
+    {1679695200 10800 1 EEST}
     {1698444000 7200 0 EET}
-    {1711663200 10800 1 EEST}
+    {1711749600 10800 1 EEST}
     {1729893600 7200 0 EET}
-    {1743112800 10800 1 EEST}
+    {1743199200 10800 1 EEST}
     {1761343200 7200 0 EET}
-    {1774562400 10800 1 EEST}
-    {1793397600 7200 0 EET}
-    {1806012000 10800 1 EEST}
+    {1774648800 10800 1 EEST}
+    {1792792800 7200 0 EET}
+    {1806098400 10800 1 EEST}
     {1824847200 7200 0 EET}
-    {1838066400 10800 1 EEST}
+    {1837548000 10800 1 EEST}
     {1856296800 7200 0 EET}
-    {1869516000 10800 1 EEST}
+    {1868997600 10800 1 EEST}
     {1887746400 7200 0 EET}
-    {1900965600 10800 1 EEST}
+    {1901052000 10800 1 EEST}
     {1919196000 7200 0 EET}
-    {1932415200 10800 1 EEST}
+    {1932501600 10800 1 EEST}
     {1950645600 7200 0 EET}
-    {1963864800 10800 1 EEST}
+    {1963951200 10800 1 EEST}
     {1982700000 7200 0 EET}
-    {1995314400 10800 1 EEST}
+    {1995400800 10800 1 EEST}
     {2014149600 7200 0 EET}
-    {2027368800 10800 1 EEST}
+    {2026850400 10800 1 EEST}
     {2045599200 7200 0 EET}
-    {2058818400 10800 1 EEST}
+    {2058300000 10800 1 EEST}
     {2077048800 7200 0 EET}
-    {2090268000 10800 1 EEST}
+    {2090354400 10800 1 EEST}
     {2108498400 7200 0 EET}
-    {2121717600 10800 1 EEST}
-    {2140552800 7200 0 EET}
-    {2153167200 10800 1 EEST}
+    {2121804000 10800 1 EEST}
+    {2139948000 7200 0 EET}
+    {2153253600 10800 1 EEST}
     {2172002400 7200 0 EET}
-    {2184616800 10800 1 EEST}
+    {2184703200 10800 1 EEST}
     {2203452000 7200 0 EET}
-    {2216671200 10800 1 EEST}
+    {2216152800 10800 1 EEST}
     {2234901600 7200 0 EET}
-    {2248120800 10800 1 EEST}
+    {2248207200 10800 1 EEST}
     {2266351200 7200 0 EET}
-    {2279570400 10800 1 EEST}
+    {2279656800 10800 1 EEST}
     {2297800800 7200 0 EET}
-    {2311020000 10800 1 EEST}
-    {2329855200 7200 0 EET}
-    {2342469600 10800 1 EEST}
+    {2311106400 10800 1 EEST}
+    {2329250400 7200 0 EET}
+    {2342556000 10800 1 EEST}
     {2361304800 7200 0 EET}
-    {2374524000 10800 1 EEST}
+    {2374005600 10800 1 EEST}
     {2392754400 7200 0 EET}
-    {2405973600 10800 1 EEST}
+    {2405455200 10800 1 EEST}
     {2424204000 7200 0 EET}
-    {2437423200 10800 1 EEST}
+    {2437509600 10800 1 EEST}
     {2455653600 7200 0 EET}
-    {2468872800 10800 1 EEST}
-    {2487708000 7200 0 EET}
-    {2500322400 10800 1 EEST}
+    {2468959200 10800 1 EEST}
+    {2487103200 7200 0 EET}
+    {2500408800 10800 1 EEST}
     {2519157600 7200 0 EET}
-    {2531772000 10800 1 EEST}
+    {2531858400 10800 1 EEST}
     {2550607200 7200 0 EET}
-    {2563826400 10800 1 EEST}
+    {2563308000 10800 1 EEST}
     {2582056800 7200 0 EET}
-    {2595276000 10800 1 EEST}
+    {2595362400 10800 1 EEST}
     {2613506400 7200 0 EET}
-    {2626725600 10800 1 EEST}
+    {2626812000 10800 1 EEST}
     {2644956000 7200 0 EET}
-    {2658175200 10800 1 EEST}
-    {2677010400 7200 0 EET}
-    {2689624800 10800 1 EEST}
+    {2658261600 10800 1 EEST}
+    {2676405600 7200 0 EET}
+    {2689711200 10800 1 EEST}
     {2708460000 7200 0 EET}
-    {2721679200 10800 1 EEST}
+    {2721160800 10800 1 EEST}
     {2739909600 7200 0 EET}
-    {2753128800 10800 1 EEST}
+    {2752610400 10800 1 EEST}
     {2771359200 7200 0 EET}
-    {2784578400 10800 1 EEST}
+    {2784664800 10800 1 EEST}
     {2802808800 7200 0 EET}
-    {2816028000 10800 1 EEST}
+    {2816114400 10800 1 EEST}
     {2834258400 7200 0 EET}
-    {2847477600 10800 1 EEST}
+    {2847564000 10800 1 EEST}
     {2866312800 7200 0 EET}
-    {2878927200 10800 1 EEST}
+    {2879013600 10800 1 EEST}
     {2897762400 7200 0 EET}
-    {2910981600 10800 1 EEST}
+    {2910463200 10800 1 EEST}
     {2929212000 7200 0 EET}
-    {2942431200 10800 1 EEST}
+    {2941912800 10800 1 EEST}
     {2960661600 7200 0 EET}
-    {2973880800 10800 1 EEST}
+    {2973967200 10800 1 EEST}
     {2992111200 7200 0 EET}
-    {3005330400 10800 1 EEST}
-    {3024165600 7200 0 EET}
-    {3036780000 10800 1 EEST}
+    {3005416800 10800 1 EEST}
+    {3023560800 7200 0 EET}
+    {3036866400 10800 1 EEST}
     {3055615200 7200 0 EET}
-    {3068229600 10800 1 EEST}
+    {3068316000 10800 1 EEST}
     {3087064800 7200 0 EET}
-    {3100284000 10800 1 EEST}
+    {3099765600 10800 1 EEST}
     {3118514400 7200 0 EET}
-    {3131733600 10800 1 EEST}
+    {3131820000 10800 1 EEST}
     {3149964000 7200 0 EET}
-    {3163183200 10800 1 EEST}
+    {3163269600 10800 1 EEST}
     {3181413600 7200 0 EET}
-    {3194632800 10800 1 EEST}
-    {3213468000 7200 0 EET}
-    {3226082400 10800 1 EEST}
+    {3194719200 10800 1 EEST}
+    {3212863200 7200 0 EET}
+    {3226168800 10800 1 EEST}
     {3244917600 7200 0 EET}
-    {3258136800 10800 1 EEST}
+    {3257618400 10800 1 EEST}
     {3276367200 7200 0 EET}
-    {3289586400 10800 1 EEST}
+    {3289068000 10800 1 EEST}
     {3307816800 7200 0 EET}
-    {3321036000 10800 1 EEST}
+    {3321122400 10800 1 EEST}
     {3339266400 7200 0 EET}
-    {3352485600 10800 1 EEST}
-    {3371320800 7200 0 EET}
-    {3383935200 10800 1 EEST}
+    {3352572000 10800 1 EEST}
+    {3370716000 7200 0 EET}
+    {3384021600 10800 1 EEST}
     {3402770400 7200 0 EET}
-    {3415384800 10800 1 EEST}
+    {3415471200 10800 1 EEST}
     {3434220000 7200 0 EET}
-    {3447439200 10800 1 EEST}
+    {3446920800 10800 1 EEST}
     {3465669600 7200 0 EET}
-    {3478888800 10800 1 EEST}
+    {3478975200 10800 1 EEST}
     {3497119200 7200 0 EET}
-    {3510338400 10800 1 EEST}
+    {3510424800 10800 1 EEST}
     {3528568800 7200 0 EET}
-    {3541788000 10800 1 EEST}
-    {3560623200 7200 0 EET}
-    {3573237600 10800 1 EEST}
+    {3541874400 10800 1 EEST}
+    {3560018400 7200 0 EET}
+    {3573324000 10800 1 EEST}
     {3592072800 7200 0 EET}
-    {3605292000 10800 1 EEST}
+    {3604773600 10800 1 EEST}
     {3623522400 7200 0 EET}
-    {3636741600 10800 1 EEST}
+    {3636223200 10800 1 EEST}
     {3654972000 7200 0 EET}
-    {3668191200 10800 1 EEST}
+    {3668277600 10800 1 EEST}
     {3686421600 7200 0 EET}
-    {3699640800 10800 1 EEST}
+    {3699727200 10800 1 EEST}
     {3717871200 7200 0 EET}
-    {3731090400 10800 1 EEST}
+    {3731176800 10800 1 EEST}
     {3749925600 7200 0 EET}
-    {3762540000 10800 1 EEST}
+    {3762626400 10800 1 EEST}
     {3781375200 7200 0 EET}
-    {3794594400 10800 1 EEST}
+    {3794076000 10800 1 EEST}
     {3812824800 7200 0 EET}
-    {3826044000 10800 1 EEST}
+    {3825525600 10800 1 EEST}
     {3844274400 7200 0 EET}
-    {3857493600 10800 1 EEST}
+    {3857580000 10800 1 EEST}
     {3875724000 7200 0 EET}
-    {3888943200 10800 1 EEST}
-    {3907778400 7200 0 EET}
-    {3920392800 10800 1 EEST}
+    {3889029600 10800 1 EEST}
+    {3907173600 7200 0 EET}
+    {3920479200 10800 1 EEST}
     {3939228000 7200 0 EET}
-    {3951842400 10800 1 EEST}
+    {3951928800 10800 1 EEST}
     {3970677600 7200 0 EET}
-    {3983896800 10800 1 EEST}
+    {3983378400 10800 1 EEST}
     {4002127200 7200 0 EET}
-    {4015346400 10800 1 EEST}
+    {4015432800 10800 1 EEST}
     {4033576800 7200 0 EET}
-    {4046796000 10800 1 EEST}
+    {4046882400 10800 1 EEST}
     {4065026400 7200 0 EET}
-    {4078245600 10800 1 EEST}
-    {4097080800 7200 0 EET}
+    {4078332000 10800 1 EEST}
+    {4096476000 7200 0 EET}
 }
diff --git a/library/tzdata/Asia/Hebron b/library/tzdata/Asia/Hebron
index fe8f7e1..aa028d8 100644
--- a/library/tzdata/Asia/Hebron
+++ b/library/tzdata/Asia/Hebron
@@ -109,7 +109,7 @@ set TZData(:Asia/Hebron) {
     {1395957600 10800 1 EEST}
     {1414098000 7200 0 EET}
     {1427493600 10800 1 EEST}
-    {1445547600 7200 0 EET}
+    {1445551200 7200 0 EET}
     {1458946800 10800 1 EEST}
     {1477692000 7200 0 EET}
     {1490396400 10800 1 EEST}
@@ -117,165 +117,165 @@ set TZData(:Asia/Hebron) {
     {1521846000 10800 1 EEST}
     {1540591200 7200 0 EET}
     {1553810400 10800 1 EEST}
-    {1572040800 7200 0 EET}
-    {1585260000 10800 1 EEST}
-    {1604095200 7200 0 EET}
-    {1616709600 10800 1 EEST}
+    {1572037200 7200 0 EET}
+    {1585346400 10800 1 EEST}
+    {1603490400 7200 0 EET}
+    {1616796000 10800 1 EEST}
     {1635544800 7200 0 EET}
-    {1648159200 10800 1 EEST}
+    {1648245600 10800 1 EEST}
     {1666994400 7200 0 EET}
-    {1680213600 10800 1 EEST}
+    {1679695200 10800 1 EEST}
     {1698444000 7200 0 EET}
-    {1711663200 10800 1 EEST}
+    {1711749600 10800 1 EEST}
     {1729893600 7200 0 EET}
-    {1743112800 10800 1 EEST}
+    {1743199200 10800 1 EEST}
     {1761343200 7200 0 EET}
-    {1774562400 10800 1 EEST}
-    {1793397600 7200 0 EET}
-    {1806012000 10800 1 EEST}
+    {1774648800 10800 1 EEST}
+    {1792792800 7200 0 EET}
+    {1806098400 10800 1 EEST}
     {1824847200 7200 0 EET}
-    {1838066400 10800 1 EEST}
+    {1837548000 10800 1 EEST}
     {1856296800 7200 0 EET}
-    {1869516000 10800 1 EEST}
+    {1868997600 10800 1 EEST}
     {1887746400 7200 0 EET}
-    {1900965600 10800 1 EEST}
+    {1901052000 10800 1 EEST}
     {1919196000 7200 0 EET}
-    {1932415200 10800 1 EEST}
+    {1932501600 10800 1 EEST}
     {1950645600 7200 0 EET}
-    {1963864800 10800 1 EEST}
+    {1963951200 10800 1 EEST}
     {1982700000 7200 0 EET}
-    {1995314400 10800 1 EEST}
+    {1995400800 10800 1 EEST}
     {2014149600 7200 0 EET}
-    {2027368800 10800 1 EEST}
+    {2026850400 10800 1 EEST}
     {2045599200 7200 0 EET}
-    {2058818400 10800 1 EEST}
+    {2058300000 10800 1 EEST}
     {2077048800 7200 0 EET}
-    {2090268000 10800 1 EEST}
+    {2090354400 10800 1 EEST}
     {2108498400 7200 0 EET}
-    {2121717600 10800 1 EEST}
-    {2140552800 7200 0 EET}
-    {2153167200 10800 1 EEST}
+    {2121804000 10800 1 EEST}
+    {2139948000 7200 0 EET}
+    {2153253600 10800 1 EEST}
     {2172002400 7200 0 EET}
-    {2184616800 10800 1 EEST}
+    {2184703200 10800 1 EEST}
     {2203452000 7200 0 EET}
-    {2216671200 10800 1 EEST}
+    {2216152800 10800 1 EEST}
     {2234901600 7200 0 EET}
-    {2248120800 10800 1 EEST}
+    {2248207200 10800 1 EEST}
     {2266351200 7200 0 EET}
-    {2279570400 10800 1 EEST}
+    {2279656800 10800 1 EEST}
     {2297800800 7200 0 EET}
-    {2311020000 10800 1 EEST}
-    {2329855200 7200 0 EET}
-    {2342469600 10800 1 EEST}
+    {2311106400 10800 1 EEST}
+    {2329250400 7200 0 EET}
+    {2342556000 10800 1 EEST}
     {2361304800 7200 0 EET}
-    {2374524000 10800 1 EEST}
+    {2374005600 10800 1 EEST}
     {2392754400 7200 0 EET}
-    {2405973600 10800 1 EEST}
+    {2405455200 10800 1 EEST}
     {2424204000 7200 0 EET}
-    {2437423200 10800 1 EEST}
+    {2437509600 10800 1 EEST}
     {2455653600 7200 0 EET}
-    {2468872800 10800 1 EEST}
-    {2487708000 7200 0 EET}
-    {2500322400 10800 1 EEST}
+    {2468959200 10800 1 EEST}
+    {2487103200 7200 0 EET}
+    {2500408800 10800 1 EEST}
     {2519157600 7200 0 EET}
-    {2531772000 10800 1 EEST}
+    {2531858400 10800 1 EEST}
     {2550607200 7200 0 EET}
-    {2563826400 10800 1 EEST}
+    {2563308000 10800 1 EEST}
     {2582056800 7200 0 EET}
-    {2595276000 10800 1 EEST}
+    {2595362400 10800 1 EEST}
     {2613506400 7200 0 EET}
-    {2626725600 10800 1 EEST}
+    {2626812000 10800 1 EEST}
     {2644956000 7200 0 EET}
-    {2658175200 10800 1 EEST}
-    {2677010400 7200 0 EET}
-    {2689624800 10800 1 EEST}
+    {2658261600 10800 1 EEST}
+    {2676405600 7200 0 EET}
+    {2689711200 10800 1 EEST}
     {2708460000 7200 0 EET}
-    {2721679200 10800 1 EEST}
+    {2721160800 10800 1 EEST}
     {2739909600 7200 0 EET}
-    {2753128800 10800 1 EEST}
+    {2752610400 10800 1 EEST}
     {2771359200 7200 0 EET}
-    {2784578400 10800 1 EEST}
+    {2784664800 10800 1 EEST}
     {2802808800 7200 0 EET}
-    {2816028000 10800 1 EEST}
+    {2816114400 10800 1 EEST}
     {2834258400 7200 0 EET}
-    {2847477600 10800 1 EEST}
+    {2847564000 10800 1 EEST}
     {2866312800 7200 0 EET}
-    {2878927200 10800 1 EEST}
+    {2879013600 10800 1 EEST}
     {2897762400 7200 0 EET}
-    {2910981600 10800 1 EEST}
+    {2910463200 10800 1 EEST}
     {2929212000 7200 0 EET}
-    {2942431200 10800 1 EEST}
+    {2941912800 10800 1 EEST}
     {2960661600 7200 0 EET}
-    {2973880800 10800 1 EEST}
+    {2973967200 10800 1 EEST}
     {2992111200 7200 0 EET}
-    {3005330400 10800 1 EEST}
-    {3024165600 7200 0 EET}
-    {3036780000 10800 1 EEST}
+    {3005416800 10800 1 EEST}
+    {3023560800 7200 0 EET}
+    {3036866400 10800 1 EEST}
     {3055615200 7200 0 EET}
-    {3068229600 10800 1 EEST}
+    {3068316000 10800 1 EEST}
     {3087064800 7200 0 EET}
-    {3100284000 10800 1 EEST}
+    {3099765600 10800 1 EEST}
     {3118514400 7200 0 EET}
-    {3131733600 10800 1 EEST}
+    {3131820000 10800 1 EEST}
     {3149964000 7200 0 EET}
-    {3163183200 10800 1 EEST}
+    {3163269600 10800 1 EEST}
     {3181413600 7200 0 EET}
-    {3194632800 10800 1 EEST}
-    {3213468000 7200 0 EET}
-    {3226082400 10800 1 EEST}
+    {3194719200 10800 1 EEST}
+    {3212863200 7200 0 EET}
+    {3226168800 10800 1 EEST}
     {3244917600 7200 0 EET}
-    {3258136800 10800 1 EEST}
+    {3257618400 10800 1 EEST}
     {3276367200 7200 0 EET}
-    {3289586400 10800 1 EEST}
+    {3289068000 10800 1 EEST}
     {3307816800 7200 0 EET}
-    {3321036000 10800 1 EEST}
+    {3321122400 10800 1 EEST}
     {3339266400 7200 0 EET}
-    {3352485600 10800 1 EEST}
-    {3371320800 7200 0 EET}
-    {3383935200 10800 1 EEST}
+    {3352572000 10800 1 EEST}
+    {3370716000 7200 0 EET}
+    {3384021600 10800 1 EEST}
     {3402770400 7200 0 EET}
-    {3415384800 10800 1 EEST}
+    {3415471200 10800 1 EEST}
     {3434220000 7200 0 EET}
-    {3447439200 10800 1 EEST}
+    {3446920800 10800 1 EEST}
     {3465669600 7200 0 EET}
-    {3478888800 10800 1 EEST}
+    {3478975200 10800 1 EEST}
     {3497119200 7200 0 EET}
-    {3510338400 10800 1 EEST}
+    {3510424800 10800 1 EEST}
     {3528568800 7200 0 EET}
-    {3541788000 10800 1 EEST}
-    {3560623200 7200 0 EET}
-    {3573237600 10800 1 EEST}
+    {3541874400 10800 1 EEST}
+    {3560018400 7200 0 EET}
+    {3573324000 10800 1 EEST}
     {3592072800 7200 0 EET}
-    {3605292000 10800 1 EEST}
+    {3604773600 10800 1 EEST}
     {3623522400 7200 0 EET}
-    {3636741600 10800 1 EEST}
+    {3636223200 10800 1 EEST}
     {3654972000 7200 0 EET}
-    {3668191200 10800 1 EEST}
+    {3668277600 10800 1 EEST}
     {3686421600 7200 0 EET}
-    {3699640800 10800 1 EEST}
+    {3699727200 10800 1 EEST}
     {3717871200 7200 0 EET}
-    {3731090400 10800 1 EEST}
+    {3731176800 10800 1 EEST}
     {3749925600 7200 0 EET}
-    {3762540000 10800 1 EEST}
+    {3762626400 10800 1 EEST}
     {3781375200 7200 0 EET}
-    {3794594400 10800 1 EEST}
+    {3794076000 10800 1 EEST}
     {3812824800 7200 0 EET}
-    {3826044000 10800 1 EEST}
+    {3825525600 10800 1 EEST}
     {3844274400 7200 0 EET}
-    {3857493600 10800 1 EEST}
+    {3857580000 10800 1 EEST}
     {3875724000 7200 0 EET}
-    {3888943200 10800 1 EEST}
-    {3907778400 7200 0 EET}
-    {3920392800 10800 1 EEST}
+    {3889029600 10800 1 EEST}
+    {3907173600 7200 0 EET}
+    {3920479200 10800 1 EEST}
     {3939228000 7200 0 EET}
-    {3951842400 10800 1 EEST}
+    {3951928800 10800 1 EEST}
     {3970677600 7200 0 EET}
-    {3983896800 10800 1 EEST}
+    {3983378400 10800 1 EEST}
     {4002127200 7200 0 EET}
-    {4015346400 10800 1 EEST}
+    {4015432800 10800 1 EEST}
     {4033576800 7200 0 EET}
-    {4046796000 10800 1 EEST}
+    {4046882400 10800 1 EEST}
     {4065026400 7200 0 EET}
-    {4078245600 10800 1 EEST}
-    {4097080800 7200 0 EET}
+    {4078332000 10800 1 EEST}
+    {4096476000 7200 0 EET}
 }
diff --git a/tests/apply.test b/tests/apply.test
index 227d3c1..8696245 100644
--- a/tests/apply.test
+++ b/tests/apply.test
@@ -25,7 +25,7 @@ testConstraint memory [llength [info commands memory]]
 
 # Tests for wrong number of arguments
 
-test apply-1.1 {too few arguments} -returnCodes error -body {
+test apply-1.1 {not enough arguments} -returnCodes error -body {
     apply
 } -result {wrong # args: should be "apply lambdaExpr ?arg ...?"}
 
diff --git a/tests/compExpr-old.test b/tests/compExpr-old.test
index f573cfa..7a9aa5c 100644
--- a/tests/compExpr-old.test
+++ b/tests/compExpr-old.test
@@ -578,13 +578,13 @@ test compExpr-old-15.3 {CompileMathFuncCall: too many arguments} -body {
 test compExpr-old-15.4 {CompileMathFuncCall: ')' found before last required arg} -body {
     catch {expr sin()} msg
     set ::errorInfo
-} -match glob -result {too few arguments for math function*
+} -match glob -result {not enough arguments for math function*
     while *ing
 "expr sin()"}
-test compExpr-old-15.5 {CompileMathFuncCall: too few arguments} -body {
+test compExpr-old-15.5 {CompileMathFuncCall: not enough arguments} -body {
     catch {expr pow(1)} msg
     set ::errorInfo
-} -match glob -result {too few arguments for math function*
+} -match glob -result {not enough arguments for math function*
     while *ing
 "expr pow(1)"}
 test compExpr-old-15.6 {CompileMathFuncCall: missing ')'} -body {
diff --git a/tests/compExpr.test b/tests/compExpr.test
index e9220c1..4a04a49 100644
--- a/tests/compExpr.test
+++ b/tests/compExpr.test
@@ -313,9 +313,9 @@ test compExpr-5.1 {CompileMathFuncCall procedure, math function found} {
 test compExpr-5.2 {CompileMathFuncCall procedure, math function not found} -body {
     expr {do_it()}
 } -returnCodes error -match glob -result {* "*do_it"}
-test compExpr-5.5 {CompileMathFuncCall procedure, too few arguments} -body {
+test compExpr-5.5 {CompileMathFuncCall procedure, not enough arguments} -body {
     expr {atan2(1.0)}
-} -returnCodes error -match glob -result {too few arguments for math function*}
+} -returnCodes error -match glob -result {not enough arguments for math function*}
 test compExpr-5.6 {CompileMathFuncCall procedure, complex argument} {
     format %.6g [expr pow(2.1, 27.5-(24.4*(5%2)))]
 } 9.97424
diff --git a/tests/expr-old.test b/tests/expr-old.test
index ad5a6bc..914530e 100644
--- a/tests/expr-old.test
+++ b/tests/expr-old.test
@@ -852,7 +852,7 @@ test expr-old-32.46 {math functions in expressions} -body {
 } -match glob -result {1 {too many arguments for math function*}}
 test expr-old-32.47 {math functions in expressions} -body {
     list [catch {expr srand()} msg] $msg
-} -match glob -result {1 {too few arguments for math function*}}
+} -match glob -result {1 {not enough arguments for math function*}}
 test expr-old-32.48 {math functions in expressions} -body {
     expr srand(3.79)
 } -returnCodes error -match glob -result *
@@ -909,7 +909,7 @@ test expr-old-34.6 {errors in math functions} -body {
 } -returnCodes error -match glob -result *
 test expr-old-34.7 {errors in math functions} -body {
     list [catch {expr hypot(1.0)} msg] $msg
-} -match glob -result {1 {too few arguments for math function*}}
+} -match glob -result {1 {not enough arguments for math function*}}
 test expr-old-34.8 {errors in math functions} -body {
     list [catch {expr hypot(1.0, 2.0, 3.0)} msg] $msg
 } -match glob -result {1 {too many arguments for math function*}}
@@ -1150,7 +1150,7 @@ test expr-old-40.2 {min math function} -body {
 } -result 0.0
 test expr-old-40.3 {min math function} -body {
     expr {min()}
-} -returnCodes error -result {too few arguments for math function "min"}
+} -returnCodes error -result {not enough arguments for math function "min"}
 test expr-old-40.4 {min math function} -body {
     expr {min(wide(-1) << 30, 4.5, -10)}
 } -result [expr {wide(-1) << 30}]
@@ -1175,7 +1175,7 @@ test expr-old-41.2 {max math function} -body {
 } -result 0.0
 test expr-old-41.3 {max math function} -body {
     expr {max()}
-} -returnCodes error -result {too few arguments for math function "max"}
+} -returnCodes error -result {not enough arguments for math function "max"}
 test expr-old-41.4 {max math function} -body {
     expr {max(wide(1) << 30, 4.5, -10)}
 } -result [expr {wide(1) << 30}]
diff --git a/tests/expr.test b/tests/expr.test
index 0b4fa2b..5e00841 100644
--- a/tests/expr.test
+++ b/tests/expr.test
@@ -685,13 +685,13 @@ test expr-15.3 {CompileMathFuncCall: too many arguments} -body {
 test expr-15.4 {CompileMathFuncCall: ')' found before last required arg} -body {
     catch {expr sin()} msg
     set ::errorInfo
-} -match glob -result {too few arguments for math function*
+} -match glob -result {not enough arguments for math function*
     while *ing
 "expr sin()"}
-test expr-15.5 {CompileMathFuncCall: too few arguments} -body {
+test expr-15.5 {CompileMathFuncCall: not enough arguments} -body {
     catch {expr pow(1)} msg
     set ::errorInfo
-} -match glob -result {too few arguments for math function*
+} -match glob -result {not enough arguments for math function*
     while *ing
 "expr pow(1)"}
 test expr-15.6 {CompileMathFuncCall: missing ')'} -body {
@@ -7251,7 +7251,7 @@ test expr-52.1 {
 foreach func {isfinite isinf isnan isnormal issubnormal} {
     test expr-53.1.$func {float classification: basic arg handling} -body {
 	expr ${func}()
-    } -returnCodes error -result "too few arguments for math function \"$func\""
+    } -returnCodes error -result "not enough arguments for math function \"$func\""
     test expr-53.2.$func {float classification: basic arg handling} -body {
 	expr ${func}(1,2)
     } -returnCodes error -result "too many arguments for math function \"$func\""
@@ -7346,10 +7346,10 @@ test expr-59.12 {float classification: fpclassify} -returnCodes error -body {
 
 test expr-60.1 {float classification: basic arg handling} -body {
     expr isunordered()
-} -returnCodes error -result {too few arguments for math function "isunordered"}
+} -returnCodes error -result {not enough arguments for math function "isunordered"}
 test expr-60.2 {float classification: basic arg handling} -body {
     expr isunordered(1)
-} -returnCodes error -result {too few arguments for math function "isunordered"}
+} -returnCodes error -result {not enough arguments for math function "isunordered"}
 test expr-60.3 {float classification: basic arg handling} -body {
     expr {isunordered(1, 2, 3)}
 } -returnCodes error -result {too many arguments for math function "isunordered"}
diff --git a/tests/string.test b/tests/string.test
index 4a8746d..4817bec 100644
--- a/tests/string.test
+++ b/tests/string.test
@@ -88,7 +88,7 @@ test stringComp-1.3.$noComp {error condition - undefined method during compile}
     foo abc 0
 } a
 
-test string-2.1.$noComp {string compare, too few args} {
+test string-2.1.$noComp {string compare, not enough args} {
     list [catch {run {string compare a}} msg] $msg
 } {1 {wrong # args: should be "string compare ?-nocase? ?-length int? string1 string2"}}
 test string-2.2.$noComp {string compare, bad args} {
@@ -251,7 +251,7 @@ test string-3.7.$noComp {string equal -nocase} {
 test string-3.8.$noComp {string equal with length, unequal strings} {
     run {string equal -length 2 abc abde}
 } 1
-test string-3.9.$noComp {string equal, too few args} {
+test string-3.9.$noComp {string equal, not enough args} {
     list [catch {run {string equal a}} msg] $msg
 } {1 {wrong # args: should be "string equal ?-nocase? ?-length int? string1 string2"}}
 test string-3.10.$noComp {string equal, bad args} {
@@ -366,7 +366,7 @@ test string-3.42.$noComp {string equal, binary neq inequal length} {
 } 0
 
 
-test string-4.1.$noComp {string first, too few args} {
+test string-4.1.$noComp {string first, not enough args} {
     list [catch {run {string first a}} msg] $msg
 } {1 {wrong # args: should be "string first needleString haystackString ?startIndex?"}}
 test string-4.2.$noComp {string first, bad args} {
@@ -520,10 +520,10 @@ proc largest_int {} {
     return [expr {$int-1}]
 }
 
-test string-6.1.$noComp {string is, too few args} {
+test string-6.1.$noComp {string is, not enough args} {
     list [catch {run {string is}} msg] $msg
 } {1 {wrong # args: should be "string is class ?-strict? ?-failindex var? str"}}
-test string-6.2.$noComp {string is, too few args} {
+test string-6.2.$noComp {string is, not enough args} {
     list [catch {run {string is alpha}} msg] $msg
 } {1 {wrong # args: should be "string is class ?-strict? ?-failindex var? str"}}
 test string-6.3.$noComp {string is, bad args} {
@@ -973,7 +973,7 @@ test string-6.131.$noComp {string is entier, false on bad hex} {
 
 catch {rename largest_int {}}
 
-test string-7.1.$noComp {string last, too few args} {
+test string-7.1.$noComp {string last, not enough args} {
     list [catch {run {string last a}} msg] $msg
 } {1 {wrong # args: should be "string last needleString haystackString ?lastIndex?"}}
 test string-7.2.$noComp {string last, bad args} {
@@ -1059,7 +1059,7 @@ test string-9.7.$noComp {string length, bytearray object} {
     run {string length [binary format I* {0x50515253 0x52}]}
 } 8
 
-test string-10.1.$noComp {string map, too few args} {
+test string-10.1.$noComp {string map, not enough args} {
     list [catch {run {string map}} msg] $msg
 } {1 {wrong # args: should be "string map ?-nocase? charMap string"}}
 test string-10.2.$noComp {string map, bad args} {
@@ -1159,7 +1159,7 @@ test string-10.31.$noComp {string map, nasty sharing crash from [Bug 1018562]} {
     run {string map $a $a}
 } {b b}
 
-test string-11.1.$noComp {string match, too few args} {
+test string-11.1.$noComp {string match, not enough args} {
     list [catch {run {string match a}} msg] $msg
 } {1 {wrong # args: should be "string match ?-nocase? pattern string"}}
 test string-11.2.$noComp {string match, too many args} {
@@ -1669,7 +1669,7 @@ test stringComp-14.26.$noComp {} {
     run {string replace abcd 0x10000000000000000-0xffffffffffffffff 2 e}
 } aed
 
-test string-15.1.$noComp {string tolower too few args} {
+test string-15.1.$noComp {string tolower not enough args} {
     list [catch {run {string tolower}} msg] $msg
 } {1 {wrong # args: should be "string tolower string ?first? ?last?"}}
 test string-15.2.$noComp {string tolower bad args} {
@@ -2120,7 +2120,7 @@ test string-25.14.$noComp {string is list} {
     list [run {string is list -failindex x "\uABCD {b c}d e"}] $x
 } {0 2}
 
-test string-26.1.$noComp {tcl::prefix, too few args} -body {
+test string-26.1.$noComp {tcl::prefix, not enough args} -body {
     tcl::prefix match a
 } -returnCodes 1 -result {wrong # args: should be "tcl::prefix match ?options? table string"}
 test string-26.2.$noComp {tcl::prefix, bad args} -body {
@@ -2247,7 +2247,7 @@ test string-26.13.$noComp {tcl::prefix: testing for leaks} -body {
     }
 } -constraints memory -result {0}
 
-test string-27.1.$noComp {tcl::prefix all, too few args} -body {
+test string-27.1.$noComp {tcl::prefix all, not enough args} -body {
     tcl::prefix all a
 } -returnCodes 1 -result {wrong # args: should be "tcl::prefix all table string"}
 test string-27.2.$noComp {tcl::prefix all, bad args} -body {
@@ -2278,7 +2278,7 @@ test string-27.10.$noComp {tcl::prefix all} {
     tcl::prefix all {apa aska appa} {}
 } {apa aska appa}
 
-test string-28.1.$noComp {tcl::prefix longest, too few args} -body {
+test string-28.1.$noComp {tcl::prefix longest, not enough args} -body {
     tcl::prefix longest a
 } -returnCodes 1 -result {wrong # args: should be "tcl::prefix longest table string"}
 test string-28.2.$noComp {tcl::prefix longest, bad args} -body {
@@ -2477,6 +2477,13 @@ test string-31.24.$noComp {string insert, string end, pure Uni, both shared} {
 test string-31.25.$noComp {string insert, neither byte array nor Unicode} {
     run {tcl::string::insert [makeList a b c] 1 zzzzzz}
 } {azzzzzz b c}
+test string-31.26.$noComp {[11229bad5f] string insert, compiler} -setup {
+    set i 2
+} -body {
+    run {tcl::string::insert abcd $i xyz}
+} -cleanup {
+    unset i
+} -result abxyzcd
 
 test string-32.1.$noComp {string is dict} {
     string is dict {a b c d}