diff options
author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-03-03 21:30:39 (GMT) |
---|---|---|
committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-03-03 21:30:39 (GMT) |
commit | 35d520ab836c85facadd88c1696a93bef48cca5a (patch) | |
tree | 61b9fd261a9a7461ac9426a83c57c994239a9bcf | |
parent | 536509d82589414ae95910bf6e1ce2295605b24d (diff) | |
parent | 6d2648a955be1a03076cfff57d28cd5a77405c93 (diff) | |
download | tcl-35d520ab836c85facadd88c1696a93bef48cca5a.zip tcl-35d520ab836c85facadd88c1696a93bef48cca5a.tar.gz tcl-35d520ab836c85facadd88c1696a93bef48cca5a.tar.bz2 |
Fix [d63061a1ac]: PRIVATE != CONTROL in Unicode
-rw-r--r-- | generic/regc_locale.c | 3 | ||||
-rw-r--r-- | generic/tclUtf.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/generic/regc_locale.c b/generic/regc_locale.c index d56f56e..3f2fc46 100644 --- a/generic/regc_locale.c +++ b/generic/regc_locale.c @@ -1101,9 +1101,8 @@ cclass( addchr(cv, ' '); break; case CC_CNTRL: - cv = getcvec(v, NUM_CONTROL_CHAR, NUM_CONTROL_RANGE+1); + cv = getcvec(v, NUM_CONTROL_CHAR, NUM_CONTROL_RANGE); if (cv) { - addrange(cv, 0xE000, 0xF8FF); /* private */ for (i=0 ; i<NUM_CONTROL_RANGE ; i++) { addrange(cv, controlRangeTable[i].start, controlRangeTable[i].end); diff --git a/generic/tclUtf.c b/generic/tclUtf.c index 736da66..6fbeb36 100644 --- a/generic/tclUtf.c +++ b/generic/tclUtf.c @@ -26,7 +26,7 @@ #define ALPHA_BITS ((1 << UPPERCASE_LETTER) | (1 << LOWERCASE_LETTER) \ | (1 << TITLECASE_LETTER) | (1 << MODIFIER_LETTER) | (1<<OTHER_LETTER)) -#define CONTROL_BITS ((1 << CONTROL) | (1 << FORMAT) | (1 << PRIVATE_USE)) +#define CONTROL_BITS ((1 << CONTROL) | (1 << FORMAT)) #define DIGIT_BITS (1 << DECIMAL_DIGIT_NUMBER) |