3 files changed, 4 insertions, 13 deletions
diff --git a/src/Document.cxx b/src/Document.cxx
index dd11ae42d..9b30b44aa 100644
--- a/src/Document.cxx
+++ b/src/Document.cxx
@@ -1698,14 +1698,6 @@ Sci::Position Document::ParaDown(Sci::Position pos) const {
 		return LineEnd(line-1);
 }
 
-bool Document::IsASCIIWordByte(unsigned char ch) const {
-	if (IsASCII(ch)) {
-		return charClass.GetClass(ch) == CharClassify::ccWord;
-	} else {
-		return false;
-	}
-}
-
 CharClassify::cc Document::WordCharacterClass(unsigned int ch) const {
 	if (dbcsCodePage && (!UTF8IsAscii(ch))) {
 		if (SC_CP_UTF8 == dbcsCodePage) {
diff --git a/src/Document.h b/src/Document.h
index adbdc3413..f662dc993 100644
--- a/src/Document.h
+++ b/src/Document.h
@@ -482,7 +482,6 @@ public:
 	bool AddWatcher(DocWatcher *watcher, void *userData);
 	bool RemoveWatcher(DocWatcher *watcher, void *userData);
 
-	bool IsASCIIWordByte(unsigned char ch) const;
 	CharClassify::cc WordCharacterClass(unsigned int ch) const;
 	bool IsWordPartSeparator(unsigned int ch) const;
 	Sci::Position WordPartLeft(Sci::Position pos) const;
diff --git a/src/EditView.cxx b/src/EditView.cxx
index 7b585c553..727efbcdd 100644
--- a/src/EditView.cxx
+++ b/src/EditView.cxx
@@ -388,8 +388,8 @@ void EditView::LayoutLine(const EditModel &model, Sci::Line line, Surface *surfa
 					allSame = allSame &&
 					(ll->chars[numCharsInLine] == MakeUpperCase(chDoc));
 				else	{ // Style::caseCamel
-					if ((model.pdoc->IsASCIIWordByte(ll->chars[numCharsInLine])) &&
-					  ((numCharsInLine == 0) || (!model.pdoc->IsASCIIWordByte(ll->chars[numCharsInLine - 1])))) {
+					if ((IsUpperOrLowerCase(ll->chars[numCharsInLine])) &&
+					  ((numCharsInLine == 0) || (!IsUpperOrLowerCase(ll->chars[numCharsInLine - 1])))) {
 						allSame = allSame && (ll->chars[numCharsInLine] == MakeUpperCase(chDoc));
 					} else {
 						allSame = allSame && (ll->chars[numCharsInLine] == MakeLowerCase(chDoc));
@@ -435,8 +435,8 @@ void EditView::LayoutLine(const EditModel &model, Sci::Line line, Surface *surfa
 				else if (vstyle.styles[ll->styles[charInLine]].caseForce == Style::caseLower)
 					ll->chars[charInLine] = MakeLowerCase(chDoc);
 				else if (vstyle.styles[ll->styles[charInLine]].caseForce == Style::caseCamel) {
-					if ((model.pdoc->IsASCIIWordByte(ll->chars[charInLine])) &&
-					  ((charInLine == 0) || (!model.pdoc->IsASCIIWordByte(ll->chars[charInLine - 1])))) {
+					if ((IsUpperOrLowerCase(ll->chars[charInLine])) &&
+					  ((charInLine == 0) || (!IsUpperOrLowerCase(ll->chars[charInLine - 1])))) {
 						ll->chars[charInLine] = MakeUpperCase(chDoc);
 					} else {
 						ll->chars[charInLine] = MakeLowerCase(chDoc);