From d33629d929fea44e7e53582be5166acb169a734e Mon Sep 17 00:00:00 2001
From: oehhar <harald.oehlmann@elmicron.de>
Date: Tue, 7 Nov 2023 12:44:21 +0000
Subject: Correct some test numbers and descriptions

---
 tests/io.test | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/io.test b/tests/io.test
index ccad9c7..9f731ad 100644
--- a/tests/io.test
+++ b/tests/io.test
@@ -1562,7 +1562,7 @@ test io-12.9 {ReadChars: multibyte chars split} -body {
 } -cleanup {
     catch {close $f}
 } -result 194
-test io-12.11 {ReadChars: multibyte chars split} -body {
+test io-12.10 {ReadChars: multibyte chars split} -body {
     set f [open $path(test1) w]
     fconfigure $f -translation binary
     puts -nonewline $f [string repeat a 9]\xC2
@@ -1576,7 +1576,7 @@ test io-12.11 {ReadChars: multibyte chars split} -body {
     catch {close $f}
 } -returnCodes 1 -match glob -result {error reading "file*":\
 	invalid or incomplete multibyte or wide character}
-test io-12.12 {ReadChars: multibyte chars split} -body {
+test io-12.11 {ReadChars: multibyte chars split} -body {
     set f [open $path(test1) w]
     fconfigure $f -translation binary
     puts -nonewline $f [string repeat a 9]\xC2
@@ -9212,7 +9212,7 @@ test io-75.6 {invalid utf-8 encoding, gets is not ignored (-profile strict)} -se
 	invalid or incomplete multibyte or wide character}
 
 test io-75.7 {
-    invalid utf-8 encoding gets is not ignored (-profile strict)
+    invalid utf-8 encoding read is not ignored (-profile strict)
 } -setup {
     set fn [makeFile {} io-75.7]
     set f [open $fn w+]
@@ -9339,7 +9339,7 @@ test io-75.10 {incomplete multibyte encoding read is ignored} -setup {
 
 # As utf-8 has a special treatment in multi-byte decoding, also test another
 # one.
-test io-75.11 {shiftjis encoding error read results in raw bytes} -setup {
+test io-75.11 {shiftjis encoding error read results in error (strict profile)} -setup {
     set fn [makeFile {} io-75.11]
     set f [open $fn w+]
     fconfigure $f -encoding binary
-- 
cgit v0.12


From ef791b806773a49297d64bbac8da4dc89cf4e6f8 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 8 Nov 2023 12:11:23 +0000
Subject: Remove version number from stub library, for Tk 9.0

---
 win/rules.vc | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/win/rules.vc b/win/rules.vc
index bca056c..4ee70ff 100644
--- a/win/rules.vc
+++ b/win/rules.vc
@@ -1240,7 +1240,11 @@ TKIMPLIBNAME	= tk$(TK_VERSION)$(SUFX).lib
 TKLIBNAME	= tcl9tk$(TK_VERSION)$(SUFX).$(EXT)
 TKIMPLIBNAME	= tcl9tk$(TK_VERSION)$(SUFX).lib
 !endif
+!if $(TK_MAJOR_VERSION) == 8
 TKSTUBLIBNAME	= tkstub$(TK_VERSION).lib
+!else
+TKSTUBLIBNAME	= tkstub.lib
+!endif
 
 !if $(DOING_TK)
 WISH 		= $(OUT_DIR)\$(WISHNAME)
-- 
cgit v0.12