summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/mbyte.c5
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 2 deletions
diff --git a/src/mbyte.c b/src/mbyte.c
index 23944018f..ca3204f21 100644
--- a/src/mbyte.c
+++ b/src/mbyte.c
@@ -2949,7 +2949,7 @@ static convertStruct toUpper[] =
{
{0x61,0x7a,1,-32},
{0xb5,0xb5,-1,743},
- {0xe0,0xf6,1,-32},
+ {0xe0,0xf6,1,-32}, /* 0xdf (German sharp s) is not upper-cased */
{0xf8,0xfe,1,-32},
{0xff,0xff,-1,121},
{0x101,0x12f,2,-1},
@@ -3129,7 +3129,8 @@ utf_toupper(a)
utf_islower(a)
int a;
{
- return (utf_toupper(a) != a);
+ /* German sharp s is lower case but has no upper case equivalent. */
+ return (utf_toupper(a) != a) || a == 0xdf;
}
/*
diff --git a/src/version.c b/src/version.c
index 773d5b03c..d8c6603d2 100644
--- a/src/version.c
+++ b/src/version.c
@@ -715,6 +715,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 536,
+/**/
535,
/**/
534,