From 51048717b5226a5648ce8b3596668b05ba111384 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 30 Jul 2021 08:08:30 +0000
Subject: [PATCH 1/3] try to update msys2 to latest version in GITHUB build

---
 .github/workflows/win-build.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/win-build.yml b/.github/workflows/win-build.yml
index 40f5b92b9912..133eabbf3c96 100644
--- a/.github/workflows/win-build.yml
+++ b/.github/workflows/win-build.yml
@@ -59,6 +59,7 @@ jobs:
         uses: msys2/setup-msys2@v2
         with:
           msystem: MINGW64
+          update: true
           install: git mingw-w64-x86_64-toolchain make
       - name: Checkout
         uses: actions/checkout@v2

From 218fd9e68f937ce837e65b79ed1edd9aa0b84cba Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sat, 31 Jul 2021 15:59:11 +0000
Subject: [PATCH 2/3] Backout last 2 commits: It appears that on Windows-2016
 the GITHUB-installed version of msys works better than the official msys2

---
 .github/workflows/win-build.yml | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/win-build.yml b/.github/workflows/win-build.yml
index 133eabbf3c96..637ca7eb83af 100644
--- a/.github/workflows/win-build.yml
+++ b/.github/workflows/win-build.yml
@@ -1,7 +1,5 @@
 name: Windows
 on: [push]
-env:
-  ERROR_ON_FAILURES: 1
 jobs:
   msvc:
     runs-on: windows-2016
@@ -40,11 +38,13 @@ jobs:
           if ($lastexitcode -ne 0) {
              throw "nmake exit code: $lastexitcode"
           }
+        env:
+          ERROR_ON_FAILURES: 1
   gcc:
     runs-on: windows-2016
     defaults:
       run:
-        shell: msys2 {0}
+        shell: bash
         working-directory: win
     strategy:
       matrix:
@@ -55,14 +55,10 @@ jobs:
           - "--enable-symbols=mem"
     # Using powershell means we need to explicitly stop on failure
     steps:
-      - name: Install MSYS2
-        uses: msys2/setup-msys2@v2
-        with:
-          msystem: MINGW64
-          update: true
-          install: git mingw-w64-x86_64-toolchain make
       - name: Checkout
         uses: actions/checkout@v2
+      - name: Install MSYS2 and Make
+        run: choco install msys2 make
       - name: Prepare
         run: |
           touch tclStubInit.c
@@ -79,3 +75,5 @@ jobs:
         run: make tcltest
       - name: Run Tests
         run: make test
+        env:
+          ERROR_ON_FAILURES: 1

From 0a3d4c25af0dab62fc3dd608c96316ec9b8afca2 Mon Sep 17 00:00:00 2001
From: oehhar <harald.oehlmann@elmicron.de>
Date: Thu, 5 Aug 2021 07:30:15 +0000
Subject: [PATCH 3/3] Clarify description of corner case 'string replace "" 0 0
 A' to return the empty string.

---
 doc/string.n | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/doc/string.n b/doc/string.n
index 8d8be3d817c0..e6f68bddfa34 100644
--- a/doc/string.n
+++ b/doc/string.n
@@ -290,9 +290,10 @@ specified as for the \fBindex\fR method.  If \fInewstring\fR is
 specified, then it is placed in the removed character range.  If
 \fIfirst\fR is less than zero then it is treated as if it were zero,
 and if \fIlast\fR is greater than or equal to the length of the string
-then it is treated as if it were \fBend\fR.  If \fIfirst\fR is greater
-than \fIlast\fR or the length of the initial string, or \fIlast\fR is
-less than 0, then the initial string is returned untouched.
+then it is treated as if it were \fBend\fR.  The initial string is
+returned untouched, if \fIfirst\fR is greater than \fIlast\fR, or if
+\fIfirst\fR is equal or greater the length of the initial string, or
+\fIlast\fR is less than 0.
 .TP
 \fBstring reverse \fIstring\fR
 .