aboutsummaryrefslogtreecommitdiffhomepage
path: root/win32
diff options
context:
space:
mode:
authorNeil <nyamatongwe@gmail.com>2016-08-28 12:35:29 +1000
committerNeil <nyamatongwe@gmail.com>2016-08-28 12:35:29 +1000
commitc305220ceb5576952f611bf1ca547a363276b3ca (patch)
treeaac15756d1526ffef62de40dd423f95b596fab96 /win32
parentcaf4c1cace9181ee1196120ea0ae6e7b5ec34e9e (diff)
downloadscintilla-mirror-c305220ceb5576952f611bf1ca547a363276b3ca.tar.gz
SC_CHARSET_DEFAULT now means code page 1252 on Windows unless code page set.
Improved documentation for character sets.
Diffstat (limited to 'win32')
-rw-r--r--win32/ScintillaWin.cxx2
1 files changed, 1 insertions, 1 deletions
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;