Merge 9.0

tcltk · Jul 10, 2023 · 669a454 · 669a454
2 parents 6510327 + 6e851ab
commit 669a454
Show file tree

Hide file tree

Showing 27 changed files with 264 additions and 211 deletions.
diff --git a/.fossil-settings/ignore-glob b/.fossil-settings/ignore-glob
@@ -48,9 +48,11 @@ libtommath/*.tex
 macosx/configure
 unix/autoMkindex.tcl
 unix/dltest.marker
+unix/dltest/embtest
 unix/dltest/*.bundle
 unix/dltest/*.dll
 unix/dltest/*.dylib
+unix/dltest/*.exe
 unix/dltest/*.o
 unix/dltest/*.sl
 unix/dltest/*.so

diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml
@@ -4,6 +4,7 @@ on:
     branches:
     - "main"
     - "core-8-branch"
+    - "core-8-6-branch"
     tags:
     - "core-**"
 permissions:
@@ -28,6 +29,7 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
+        timeout-minutes: 5
       - name: Prepare
         run: |
           touch tclStubInit.c tclOOStubInit.c tclOOScript.h
@@ -38,23 +40,30 @@ jobs:
           ./configure ${CFGOPT} "--prefix=$HOME/install dir" || (cat config.log && exit 1)
         env:
           CFGOPT: ${{ matrix.cfgopt }}
+        timeout-minutes: 5
       - name: Build
         run: |
           make all
+        timeout-minutes: 5
       - name: Build Test Harness
         run: |
           make tcltest
+        timeout-minutes: 5
       - name: Run Tests
         run: |
           make test
         env:
           ERROR_ON_FAILURES: 1
+        timeout-minutes: 30
       - name: Test-Drive Installation
         run: |
           make install
+        timeout-minutes: 5
       - name: Create Distribution Package
         run: |
           make dist
+        timeout-minutes: 5
       - name: Convert Documentation to HTML
         run: |
           make html-tcl
+        timeout-minutes: 5
diff --git a/.github/workflows/mac-build.yml b/.github/workflows/mac-build.yml
@@ -4,6 +4,7 @@ on:
     branches:
     - "main"
     - "core-8-branch"
+    - "core-8-6-branch"
     tags:
     - "core-**"
 permissions:
@@ -18,6 +19,7 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
+        timeout-minutes: 5
       - name: Prepare
         run: |
           touch tclStubInit.c tclOOStubInit.c tclOOScript.h
@@ -26,11 +28,13 @@ jobs:
         run: make all
         env:
           CFLAGS: -arch x86_64 -arch arm64
+        timeout-minutes: 15
       - name: Run Tests
         run: make test styles=develop
         env:
           ERROR_ON_FAILURES: 1
           MAC_CI: 1
+        timeout-minutes: 15
   clang:
     runs-on: macos-11
     strategy:
@@ -48,6 +52,7 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
+        timeout-minutes: 5
       - name: Prepare
         run: |
           touch tclStubInit.c tclOOStubInit.c tclOOScript.h
@@ -59,14 +64,17 @@ jobs:
         env:
           CFLAGS: -arch x86_64 -arch arm64
           CFGOPT: ${{ matrix.cfgopt }}
+        timeout-minutes: 5
       - name: Build
         run: |
           make all tcltest
         env:
           CFLAGS: -arch x86_64 -arch arm64
+        timeout-minutes: 15
       - name: Run Tests
         run: |
           make test
         env:
           ERROR_ON_FAILURES: 1
           MAC_CI: 1
+        timeout-minutes: 15
diff --git a/.github/workflows/onefiledist.yml b/.github/workflows/onefiledist.yml
@@ -15,6 +15,7 @@ jobs:
     defaults:
       run:
         shell: bash
+    timeout-minutes: 10
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -50,6 +51,7 @@ jobs:
     defaults:
       run:
         shell: bash
+    timeout-minutes: 10
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -112,6 +114,7 @@ jobs:
     defaults:
       run:
         shell: msys2 {0}
+    timeout-minutes: 10
     env:
       CC: gcc
       CFGOPT: --disable-symbols --disable-shared

diff --git a/.github/workflows/win-build.yml b/.github/workflows/win-build.yml
@@ -4,6 +4,7 @@ on:
     branches:
     - "main"
     - "core-8-branch"
+    - "core-8-6-branch"
     tags:
     - "core-**"
 permissions:
@@ -29,26 +30,31 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
+        timeout-minutes: 5
       - name: Init MSVC
         uses: ilammy/msvc-dev-cmd@v1
+        timeout-minutes: 5
       - name: Build ${{ matrix.cfgopt }}
         run: |
           &nmake -f makefile.vc ${{ matrix.cfgopt }} all
           if ($lastexitcode -ne 0) {
              throw "nmake exit code: $lastexitcode"
           }
+        timeout-minutes: 5
       - name: Build Test Harness ${{ matrix.cfgopt }}
         run: |
           &nmake -f makefile.vc ${{ matrix.cfgopt }} tcltest
           if ($lastexitcode -ne 0) {
              throw "nmake exit code: $lastexitcode"
           }
+        timeout-minutes: 5
       - name: Run Tests ${{ matrix.cfgopt }}
         run: |
           &nmake -f makefile.vc ${{ matrix.cfgopt }} test
           if ($lastexitcode -ne 0) {
              throw "nmake exit code: $lastexitcode"
           }
+        timeout-minutes: 30
   gcc:
     runs-on: windows-2022
     defaults:
@@ -71,8 +77,10 @@ jobs:
         with:
           msystem: MINGW64
           install: git mingw-w64-x86_64-toolchain make
+        timeout-minutes: 10
       - name: Checkout
         uses: actions/checkout@v3
+        timeout-minutes: 5
       - name: Prepare
         run: |
           touch tclStubInit.c tclOOStubInit.c tclOOScript.h
@@ -83,12 +91,16 @@ jobs:
           ./configure ${CFGOPT} "--prefix=$HOME/install dir" || (cat config.log && exit 1)
         env:
           CFGOPT: --enable-64bit ${{ matrix.cfgopt }}
+        timeout-minutes: 5
       - name: Build
         run: make all
+        timeout-minutes: 5
       - name: Build Test Harness
         run: make tcltest
+        timeout-minutes: 5
       - name: Run Tests
         run: make test
+        timeout-minutes: 30
 
 # If you add builds with Wine, be sure to define the environment variable
 # CI_USING_WINE when running them so that broken tests know not to run.
diff --git a/.gitignore b/.gitignore
@@ -53,6 +53,7 @@ libtommath/*.tex
 macosx/configure
 unix/autoMkindex.tcl
 unix/dltest.marker
+unix/dltest/embtest
 unix/tcl.pc
 unix/tclIndex
 unix/pkgs/*

diff --git a/changes b/changes
@@ -8247,7 +8247,7 @@ Dropped support for OS X versions less than 10.4 (Tiger) (fellows)
 
 2013-06-05 (bug fix)[2835313] [while 1 {foo [continue]}] crash (fellows)
 
-2013-06-17 (bug fix)[a876646] [:cntrl:] includes \x00 to \x1f (nijtmans)
+2013-06-17 (bug fix)[a876646] [:cntrl:] includes \x00 to \x1F (nijtmans)
 
 2013-06-27 (bug fix)[983509] missing encodings for config values (nijtmans)
 

diff --git a/doc/Encoding.3 b/doc/Encoding.3
@@ -547,13 +547,13 @@ encoding:
 E
 init		{}
 final		{}
-iso8859-1	\ex1b(B
-jis0201		\ex1b(J
-jis0208		\ex1b$@
-jis0208		\ex1b$B
-jis0212		\ex1b$(D
-gb2312		\ex1b$A
-ksc5601		\ex1b$(C
+iso8859-1	\ex1B(B
+jis0201		\ex1B(J
+jis0208		\ex1B$@
+jis0208		\ex1B$B
+jis0212		\ex1B$(D
+gb2312		\ex1B$A
+ksc5601		\ex1B$(C
 .CE
 .PP
 In the file, the first column represents an option and the second column
@@ -565,7 +565,7 @@ marks that encoding.  Tcl syntax is used for the values; in the above
 example, for instance,
 .QW \fB{}\fR
 represents the empty string and
-.QW \fB\ex1b\fR
+.QW \fB\ex1B\fR
 represents character 27.
 .PP
 When \fBTcl_GetEncoding\fR encounters an encoding \fIname\fR that has not