diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-01-21 16:31:24 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-01-21 16:31:24 (GMT) |
| commit | 0a1b304cf5f4017ec43d0d2b0ef7993ceba2382c (patch) | |
| tree | 70000c415246922e123ee71514920ab10a5c64f3 | |
| parent | a4d5f5c006443ee37e695cbf2d7b5030f2fd8e1d (diff) | |
| parent | f6c924bc7323104fcefc728b1f6407e70cf585ae (diff) | |
| download | tcl-0a1b304cf5f4017ec43d0d2b0ef7993ceba2382c.zip tcl-0a1b304cf5f4017ec43d0d2b0ef7993ceba2382c.tar.gz tcl-0a1b304cf5f4017ec43d0d2b0ef7993ceba2382c.tar.bz2 | |
Merge 8.6
| -rw-r--r-- | generic/regc_locale.c | 3 | ||||
| -rw-r--r-- | generic/tclUtf.c | 8 |
2 files changed, 2 insertions, 9 deletions
diff --git a/generic/regc_locale.c b/generic/regc_locale.c index adeb0bd..9a984f5 100644 --- a/generic/regc_locale.c +++ b/generic/regc_locale.c @@ -302,8 +302,7 @@ static const crange controlRangeTable[] = { {0x202A, 0x202E}, {0x2060, 0x2064}, {0x2066, 0x206F}, {0xE000, 0xF8FF}, {0xFFF9, 0xFFFB} #if CHRBITS > 16 - ,{0x13430, 0x1343F}, {0x1BCA0, 0x1BCA3}, {0x1D173, 0x1D17A}, {0xE0020, 0xE007F}, - {0xF0000, 0xFFFFD}, {0x100000, 0x10FFFD} + ,{0x13430, 0x1343F}, {0x1BCA0, 0x1BCA3}, {0x1D173, 0x1D17A}, {0xE0020, 0xE007F} #endif }; diff --git a/generic/tclUtf.c b/generic/tclUtf.c index 8d5d8f9..44a0a75 100644 --- a/generic/tclUtf.c +++ b/generic/tclUtf.c @@ -2269,13 +2269,7 @@ Tcl_UniCharIsControl( if (UNICODE_OUT_OF_RANGE(ch)) { /* Clear away extension bits, if any */ ch &= 0x1FFFFF; - if ((ch == 0xE0001) || ((ch >= 0xE0020) && (ch <= 0xE007F))) { - return 1; - } - if ((ch >= 0xF0000) && ((ch & 0xFFFF) <= 0xFFFD)) { - return 1; - } - return 0; + return ((ch == 0xE0001) || ((unsigned)(ch - 0xE0020) <= 0x5F)); } return ((CONTROL_BITS >> GetCategory(ch)) & 1); } |