From c305220ceb5576952f611bf1ca547a363276b3ca Mon Sep 17 00:00:00 2001
From: Neil <nyamatongwe@gmail.com>
Date: Sun, 28 Aug 2016 12:35:29 +1000
Subject: SC_CHARSET_DEFAULT now means code page 1252 on Windows unless code
 page set. Improved documentation for character sets.

---
 win32/ScintillaWin.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'win32')

diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx
index 3ed249ca0..10d119b5a 100644
--- a/win32/ScintillaWin.cxx
+++ b/win32/ScintillaWin.cxx
@@ -1145,7 +1145,7 @@ UINT CodePageFromCharSet(DWORD characterSet, UINT documentCodePage) {
 	}
 	switch (characterSet) {
 	case SC_CHARSET_ANSI: return 1252;
-	case SC_CHARSET_DEFAULT: return documentCodePage;
+	case SC_CHARSET_DEFAULT: return documentCodePage ? documentCodePage : 1252;
 	case SC_CHARSET_BALTIC: return 1257;
 	case SC_CHARSET_CHINESEBIG5: return 950;
 	case SC_CHARSET_EASTEUROPE: return 1250;
-- 
cgit v1.2.3