summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2020-05-20 19:12:25 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2020-05-20 19:12:25 (GMT)
commitc54b77dd74aea1da2d41ad0a067214ed7e85fc7c (patch)
tree89fa3d8212dd2d6e18d58eb20bad09ae4263eb23 /generic
parent3715125afc843efb0e1642083397156fd2f25e89 (diff)
parent6de32c896abb44a00ad7368892924e9c9de5db11 (diff)
downloadtcl-c54b77dd74aea1da2d41ad0a067214ed7e85fc7c.zip
tcl-c54b77dd74aea1da2d41ad0a067214ed7e85fc7c.tar.gz
tcl-c54b77dd74aea1da2d41ad0a067214ed7e85fc7c.tar.bz2
Merge 8.7
Diffstat (limited to 'generic')
-rw-r--r--generic/tcl.h2
-rw-r--r--generic/tclUtf.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/generic/tcl.h b/generic/tcl.h
index 874f6e9..d6de75d 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -1916,7 +1916,7 @@ typedef struct Tcl_EncodingType {
* Unicode character in UTF-8. The valid values are 3 and 4
* (or perhaps 1 if we want to support a non-unicode enabled core). If > 3,
* then Tcl_UniChar must be 4-bytes in size (UCS-4) (the default). If == 3,
- * then Tcl_UniChar must be 2-bytes in size (UCS-2). Since Tcl 9.0, UCS-4
+ * then Tcl_UniChar must be 2-bytes in size (UTF-16). Since Tcl 9.0, UCS-4
* mode is the default and recommended mode.
*/
diff --git a/generic/tclUtf.c b/generic/tclUtf.c
index fde80ae..3de767d 100644
--- a/generic/tclUtf.c
+++ b/generic/tclUtf.c
@@ -55,7 +55,7 @@
#define UNICODE_SELF 0x80
/*
- * The following structures are used when mapping between Unicode (UCS-2) and
+ * The following structures are used when mapping between Unicode and
* UTF-8.
*/