Merge 9.0

3 files changed, 5 insertions, 2 deletions

diff --git a/generic/tclStringObj.c b/generic/tclStringObj.c
index 4cf3bdd..63dcdfb 100644
--- a/generic/tclStringObj.c
+++ b/generic/tclStringObj.c
@@ -546,7 +546,7 @@ Tcl_GetUniChar(
 	    TclNumUtfChars(stringPtr->numChars, objPtr->bytes, objPtr->length);
 	}
 	if (stringPtr->numChars == objPtr->length) {
-	    return (Tcl_UniChar) objPtr->bytes[index];
+	    return (unsigned char) objPtr->bytes[index];
 	}
 	FillUnicodeRep(objPtr);
 	stringPtr = GET_STRING(objPtr);
diff --git a/tests/string.test b/tests/string.test
index d5a4815..70b0e0f 100644
--- a/tests/string.test
+++ b/tests/string.test
@@ -510,6 +510,9 @@ test string-5.20.$noComp {string index, bytearray object out of bounds} -body {
 test string-5.21.$noComp {string index, surrogates, bug [11ae2be95dac9417]} -constraints fullutf -body {
     run {list [string index a\U100000b 1] [string index a\U100000b 2] [string index a\U100000b 3]}
 } -result [list \U100000 b {}]
+test string-5.22.$noComp {string index} -constraints testbytestring -body {
+    run {list [scan [string index [testbytestring \xFF] 0] %c var] $var}
+} -result {1 255}
 
 
 test string-6.1.$noComp {string is, not enough args} {
diff --git a/tools/tcltk-man2html.tcl b/tools/tcltk-man2html.tcl
index 504978e..16b61ed 100755
--- a/tools/tcltk-man2html.tcl
+++ b/tools/tcltk-man2html.tcl
@@ -682,7 +682,7 @@ array set exclude_refs_map {
     ttk_scale.n		{variable}
     ttk_scrollbar.n	{set}
     ttk_spinbox.n	{format}
-    ttk_treeview.n	{text open}
+    ttk_treeview.n	{text open focus selection}
     ttk_widget.n	{image text variable}
     TclZlib.3		{binary flush filename text}
 }