Fix regression for using ANSI code pages.

https://sourceforge.net/p/scintilla/bugs/2093/ XhmikosR/notepad2-mod#173 XhmikosR/notepad2-mod#195 rizonesoft/Notepad3#23
zufuliu · Apr 5, 2019 · 0dbd3b4 · 0dbd3b4
1 parent 351f34c
commit 0dbd3b4
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/scintilla/win32/ScintillaWin.cxx b/scintilla/win32/ScintillaWin.cxx
@@ -1315,12 +1315,15 @@ unsigned int SciMessageFromEM(unsigned int iMessage) noexcept {
 namespace Scintilla {
 
 UINT CodePageFromCharSet(DWORD characterSet, UINT documentCodePage) noexcept {
+	// UTF-8 and DBCS ANSI code pages
 	if (documentCodePage) {
 		return documentCodePage;
 	}
+	// SBCS code pages: zero / CP_ACP
 	switch (characterSet) {
 	case SC_CHARSET_ANSI: return 1252;
-	case SC_CHARSET_DEFAULT: return documentCodePage ? documentCodePage : 1252;
+	//case SC_CHARSET_DEFAULT: return documentCodePage ? documentCodePage : 1252;
+	case SC_CHARSET_DEFAULT: return documentCodePage;
 	case SC_CHARSET_BALTIC: return 1257;
 	case SC_CHARSET_CHINESEBIG5: return 950;
 	case SC_CHARSET_EASTEUROPE: return 1250;