summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2023-06-13 09:12:25 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2023-06-13 09:12:25 (GMT)
commit478601a07b6c947d19f75d8436a78008553956a6 (patch)
treedc7d35f3bac3a176b20d1144114f76903401cf9d
parentd07e50e54a59bd0355c5fa01c44ef95b1677835c (diff)
parent3c8ac03074fc97f5cacb7163698d37faa4c2f07e (diff)
downloadtcl-478601a07b6c947d19f75d8436a78008553956a6.zip
tcl-478601a07b6c947d19f75d8436a78008553956a6.tar.gz
tcl-478601a07b6c947d19f75d8436a78008553956a6.tar.bz2
Merge 8.7
-rw-r--r--doc/library.n3
-rw-r--r--tests/encoding.test2
2 files changed, 4 insertions, 1 deletions
diff --git a/doc/library.n b/doc/library.n
index 64252f3..fb43364 100644
--- a/doc/library.n
+++ b/doc/library.n
@@ -248,6 +248,9 @@ For example, to print the contents of the \fBtcl_platform\fR array, do:
\fBparray\fR tcl_platform
.CE
.RE
+.SS "WORD BOUNDARY HELPERS"
+.PP
+These procedures are mainly used internally by Tk.
.TP
\fBtcl_endOfWord \fIstr start\fR
.
diff --git a/tests/encoding.test b/tests/encoding.test
index 26ddb69..506ab2c 100644
--- a/tests/encoding.test
+++ b/tests/encoding.test
@@ -780,7 +780,7 @@ test encoding-24.3 {EscapeFreeProc on open channels} {stdio} {
} [list 3 "乎乞也 (\\u4E4E\\u4E5E\\u4E5F)"]
test encoding-24.4 {Parse valid or invalid utf-8} {
- string length [encoding convertfrom utf-8 "\xC0\x80"]
+ string length [encoding convertfrom -profile tcl8 utf-8 "\xC0\x80"]
} 1
test encoding-24.5 {Parse valid or invalid utf-8} {
string length [encoding convertfrom -profile tcl8 utf-8 "\xC0\x81"]