Merge 8.7

2 files changed, 33 insertions, 33 deletions

diff --git a/.github/workflows/win-build.yml b/.github/workflows/win-build.yml
index 851774f..40b4a6e 100644
--- a/.github/workflows/win-build.yml
+++ b/.github/workflows/win-build.yml
@@ -21,9 +21,9 @@ jobs:
     # Using powershell means we need to explicitly stop on failure
     strategy:
       matrix:
-        symbols:
-          - "none"
-          - "symbols"
+        config:
+          - "OPTS=none"
+          - "OPTS=symbols"
     steps:
       - name: Checkout Tk
         uses: actions/checkout@v4
@@ -45,32 +45,32 @@ jobs:
           mkdir install
           cd install
           echo "INSTALLDIR=`pwd`" >> $GITHUB_ENV
-      - name: Build Tcl (OPTS=${{ matrix.symbols }})
+      - name: Build Tcl (${{ matrix.config }})
         run: |
-          &nmake -f makefile.vc release install OPTS=${{ matrix.symbols }}
+          &nmake -f makefile.vc release install ${{ matrix.config }}
           if ($lastexitcode -ne 0) {
              throw "nmake exit code: $lastexitcode"
           }
         working-directory: tcl/win
-      - name: Build Tk (OPTS=${{ matrix.symbols }})
+      - name: Build Tk (${{ matrix.config }})
         run: |
-          &nmake -f makefile.vc all OPTS=${{ matrix.symbols }}
+          &nmake -f makefile.vc all ${{ matrix.config }}
           if ($lastexitcode -ne 0) {
              throw "nmake exit code: $lastexitcode"
           }
-      - name: Build Test Harness (OPTS=${{ matrix.symbols }})
+      - name: Build Test Harness (${{ matrix.config }})
         run: |
-          &nmake -f makefile.vc tktest OPTS=${{ matrix.symbols }}
+          &nmake -f makefile.vc tktest ${{ matrix.config }}
           if ($lastexitcode -ne 0) {
              throw "nmake exit code: $lastexitcode"
           }
-      - name: Run Tk Tests (OPTS=${{ matrix.symbols }})
+      - name: Run Tk Tests (${{ matrix.config }})
         run: |
-          nmake -f makefile.vc test-classic OPTS=${{ matrix.symbols }} | tee out-classic.txt || {
+          nmake -f makefile.vc test-classic ${{ matrix.config }} | tee out-classic.txt || {
             echo "::error::Failure during Test"
             exit 1
           }
-          nmake -f makefile.vc test-ttk OPTS=${{ matrix.symbols }} | tee out-ttk.txt || {
+          nmake -f makefile.vc test-ttk ${{ matrix.config }} | tee out-ttk.txt || {
             echo "::error::Failure during Test"
             exit 1
           }
@@ -86,15 +86,15 @@ jobs:
           CI_BUILD_WITH_MSVC: 1
         shell: bash
         timeout-minutes: 15
-      - name: Build Help (OPTS=${{ matrix.symbols }})
+      - name: Build Help (${{ matrix.config }})
         run: |
-          &nmake -f makefile.vc htmlhelp OPTS=${{ matrix.symbols }}
+          &nmake -f makefile.vc htmlhelp ${{ matrix.config }}
           if ($lastexitcode -ne 0) {
              throw "nmake exit code: $lastexitcode"
           }
-      - name: Install (OPTS=${{ matrix.symbols }})
+      - name: Install (${{ matrix.config }})
         run: |
-          &nmake -f makefile.vc install OPTS=${{ matrix.symbols }}
+          &nmake -f makefile.vc install ${{ matrix.config }}
           if ($lastexitcode -ne 0) {
              throw "nmake exit code: $lastexitcode"
           }
@@ -106,10 +106,11 @@ jobs:
         working-directory: win
     strategy:
       matrix:
-        symbols:
-          - "no"
-          - "mem"
-          - "all"
+        config:
+          - ""
+          - "--enable-config=mem"
+          - "--enable-config=all"
+          - "--disable-shared"
     steps:
       - name: Install MSYS2
         uses: msys2/setup-msys2@v2
@@ -131,7 +132,7 @@ jobs:
           mkdir "${HOME}/install_dir"
           echo "INSTALL_DIR=${HOME}/install_dir" >> $GITHUB_ENV
         working-directory: generic
-      - name: Configure and Build Tcl
+      - name: Configure and Build Tcl (${{ matrix.config }})
         run: |
           ./configure $CFGOPT "--prefix=$INSTALL_DIR" || {
             cat config.log
@@ -144,9 +145,9 @@ jobs:
           }
           echo "TCL_CONFIG_PATH=`pwd`" >> $GITHUB_ENV
         env:
-          CFGOPT: --enable-64bit --enable-symbols=${{ matrix.symbols }}
+          CFGOPT: --enable-64bit ${{ matrix.config }}
         working-directory: tcl/win
-      - name: Configure Tk (symbols=${{ matrix.symbols }})
+      - name: Configure Tk (${{ matrix.config }})
         run: |
           ./configure $CFGOPT "--prefix=$HOME/INSTALL_DIR" "--with-tcl=$TCL_CONFIG_PATH" || {
             cat config.log
@@ -154,7 +155,7 @@ jobs:
             exit 1
           }
         env:
-          CFGOPT: --enable-64bit --enable-symbols=${{ matrix.symbols }}
+          CFGOPT: --enable-64bit ${{ matrix.config }}
       - name: Build Tk
         run: |
           make all tktest || {
diff --git a/library/menu.tcl b/library/menu.tcl
index 3043147..d74c9d2 100644
--- a/library/menu.tcl
+++ b/library/menu.tcl
@@ -632,8 +632,8 @@ proc ::tk::MenuInvoke {w buttonRelease} {
 	MenuUnpost $w
     } elseif {[$w cget -type] eq "menubar"} {
 	$w postcascade {}
-	set active [$w index active]
-	set isCascade [string equal [$w type $active] "cascade"]
+	set activeindex [$w index active]
+	set isCascade [string equal [$w type $activeindex] "cascade"]
 
 	# Only de-activate the active item if it's a cascade; this prevents
 	# the annoying "activation flicker" you otherwise get with
@@ -651,11 +651,10 @@ proc ::tk::MenuInvoke {w buttonRelease} {
 	# but not recommended)
 
 	if { !$isCascade } {
-	    uplevel #0 [list $w invoke $active]
+	    uplevel #0 [list $w invoke $activeindex]
 	}
     } else {
-	set active [$w index active]
-	if {$Priv(popup) eq "" || $active >= 0} {
+	if {$Priv(popup) eq "" || [$w index active] >= 0} {
 	    MenuUnpost $w
 	}
 	uplevel #0 [list $w invoke active]
@@ -827,11 +826,11 @@ proc ::tk::MenuNextEntry {menu count} {
     }
     set length [expr {$last+1}]
     set quitAfter $length
-    set active [$menu index active]
-    if {$active < 0} {
+    set activeindex [$menu index active]
+    if {$actactiveindexive < 0} {
 	set i 0
     } else {
-	set i [expr {$active + $count}]
+	set i [expr {$activeindex + $count}]
     }
     while {1} {
 	if {$quitAfter <= 0} {
@@ -853,7 +852,7 @@ proc ::tk::MenuNextEntry {menu count} {
 		break
 	    }
 	}
-	if {$i == $active} {
+	if {$i == $activeindex} {
 	    return
 	}
 	incr i $count