From 177b62bf4d401ed96154ce5a861a1fae4897f775 Mon Sep 17 00:00:00 2001
From: Robin Dunn <robin@alldunn.com>
Date: Thu, 7 Feb 2002 23:15:28 +0000
Subject: [PATCH] Patch from Neil H.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14058 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 contrib/src/stc/scintilla/src/PropSet.cxx | 67 ++++++++++-------------
 src/stc/scintilla/src/PropSet.cxx         | 67 ++++++++++-------------
 2 files changed, 58 insertions(+), 76 deletions(-)

diff --git a/contrib/src/stc/scintilla/src/PropSet.cxx b/contrib/src/stc/scintilla/src/PropSet.cxx
index 4e87508796..e97a7f7bef 100644
--- a/contrib/src/stc/scintilla/src/PropSet.cxx
+++ b/contrib/src/stc/scintilla/src/PropSet.cxx
@@ -32,49 +32,40 @@ static inline bool IsLetter(char ch) {
 
 
 int CompareCaseInsensitive(const char *a, const char *b) {
-	while (*a && *b) {
-		if (*a != *b) {
-			if (IsLetter(*a) && IsLetter(*b)) {
-				char upperA = MakeUpperCase(*a);
-				char upperB = MakeUpperCase(*b);
-				if (upperA != upperB)
-					return upperA - upperB;
-			}
-			else {
-				return *a - *b;
-			}
-		}
-		a++;
-		b++;
-	}
-	// Either *a or *b is nul
-	return *a - *b;
+    while (*a && *b) {
+        if (*a != *b) {
+            char upperA = MakeUpperCase(*a);
+            char upperB = MakeUpperCase(*b);
+            if (upperA != upperB)
+                return upperA - upperB;
+        }
+        a++;
+        b++;
+    }
+    // Either *a or *b is nul
+    return *a - *b;
 }
 
 int CompareNCaseInsensitive(const char *a, const char *b, int len) {
-	while (*a && *b && len) {
-		if (*a != *b) {
-			if (IsLetter(*a) && IsLetter(*b)) {
-				char upperA = MakeUpperCase(*a);
-				char upperB = MakeUpperCase(*b);
-				if (upperA != upperB)
-					return upperA - upperB;
-			}
-			else {
-				return *a - *b;
-			}
-		}
-		a++;
-		b++;
-		len--;
-	}
-	if (len == 0)
-		return 0;
-	else
-		// Either *a or *b is nul
-		return *a - *b;
+    while (*a && *b && len) {
+        if (*a != *b) {
+            char upperA = MakeUpperCase(*a);
+            char upperB = MakeUpperCase(*b);
+            if (upperA != upperB)
+                return upperA - upperB;
+        }
+        a++;
+        b++;
+        len--;
+    }
+    if (len == 0)
+        return 0;
+    else
+        // Either *a or *b is nul
+        return *a - *b;
 }
 
+
 bool EqualCaseInsensitive(const char *a, const char *b) {
 	return 0 == CompareCaseInsensitive(a, b);
 }
diff --git a/src/stc/scintilla/src/PropSet.cxx b/src/stc/scintilla/src/PropSet.cxx
index 4e87508796..e97a7f7bef 100644
--- a/src/stc/scintilla/src/PropSet.cxx
+++ b/src/stc/scintilla/src/PropSet.cxx
@@ -32,49 +32,40 @@ static inline bool IsLetter(char ch) {
 
 
 int CompareCaseInsensitive(const char *a, const char *b) {
-	while (*a && *b) {
-		if (*a != *b) {
-			if (IsLetter(*a) && IsLetter(*b)) {
-				char upperA = MakeUpperCase(*a);
-				char upperB = MakeUpperCase(*b);
-				if (upperA != upperB)
-					return upperA - upperB;
-			}
-			else {
-				return *a - *b;
-			}
-		}
-		a++;
-		b++;
-	}
-	// Either *a or *b is nul
-	return *a - *b;
+    while (*a && *b) {
+        if (*a != *b) {
+            char upperA = MakeUpperCase(*a);
+            char upperB = MakeUpperCase(*b);
+            if (upperA != upperB)
+                return upperA - upperB;
+        }
+        a++;
+        b++;
+    }
+    // Either *a or *b is nul
+    return *a - *b;
 }
 
 int CompareNCaseInsensitive(const char *a, const char *b, int len) {
-	while (*a && *b && len) {
-		if (*a != *b) {
-			if (IsLetter(*a) && IsLetter(*b)) {
-				char upperA = MakeUpperCase(*a);
-				char upperB = MakeUpperCase(*b);
-				if (upperA != upperB)
-					return upperA - upperB;
-			}
-			else {
-				return *a - *b;
-			}
-		}
-		a++;
-		b++;
-		len--;
-	}
-	if (len == 0)
-		return 0;
-	else
-		// Either *a or *b is nul
-		return *a - *b;
+    while (*a && *b && len) {
+        if (*a != *b) {
+            char upperA = MakeUpperCase(*a);
+            char upperB = MakeUpperCase(*b);
+            if (upperA != upperB)
+                return upperA - upperB;
+        }
+        a++;
+        b++;
+        len--;
+    }
+    if (len == 0)
+        return 0;
+    else
+        // Either *a or *b is nul
+        return *a - *b;
 }
 
+
 bool EqualCaseInsensitive(const char *a, const char *b) {
 	return 0 == CompareCaseInsensitive(a, b);
 }
-- 
2.45.2