diff --git a/src/Edit.c b/src/Edit.c index 228bd9e2bd..b92b0eea06 100644 --- a/src/Edit.c +++ b/src/Edit.c @@ -59,6 +59,7 @@ extern BOOL bAutoStripBlanks; extern int iDefaultCodePage; //extern int iDefaultCharSet; extern BOOL bLoadANSIasUTF8; +extern BOOL bLoadASCIIasUTF8; extern BOOL bLoadNFOasOEM; extern int iSrcEncoding; extern int iWeakSrcEncoding; @@ -951,7 +952,7 @@ BOOL EditSaveFile(HWND hwnd, LPCWSTR pszFile, BOOL bSaveCopy, EditFileIOStatus * int iEncoding = status->iEncoding; UINT uFlags = mEncoding[iEncoding].uFlags; if (cbData >= MAX_NON_UTF8_SIZE) { - // save in UTF-8 or ANSI + // save as UTF-8 or ANSI if (!(uFlags & (NCP_DEFAULT | NCP_UTF8))) { if (uFlags & NCP_UNICODE_BOM) { iEncoding = CPI_UTF8SIGN; diff --git a/src/Notepad2.c b/src/Notepad2.c index 12ac27a13c..c6564cf355 100644 --- a/src/Notepad2.c +++ b/src/Notepad2.c @@ -153,6 +153,7 @@ static BOOL bViewEOLs; int iDefaultEncoding; BOOL bSkipUnicodeDetection; BOOL bLoadANSIasUTF8; +BOOL bLoadASCIIasUTF8; BOOL bLoadNFOasOEM; BOOL bNoEncodingTags; int iSrcEncoding = -1; @@ -5375,6 +5376,7 @@ void LoadSettings(void) { bSkipUnicodeDetection = IniSectionGetBool(pIniSection, L"SkipUnicodeDetection", 1); bLoadANSIasUTF8 = IniSectionGetBool(pIniSection, L"LoadANSIasUTF8", 0); + bLoadASCIIasUTF8 = IniSectionGetBool(pIniSection, L"LoadASCIIasUTF8", 1); bLoadNFOasOEM = IniSectionGetBool(pIniSection, L"LoadNFOasOEM", 1); bNoEncodingTags = IniSectionGetBool(pIniSection, L"NoEncodingTags", 0); @@ -5694,6 +5696,7 @@ void SaveSettings(BOOL bSaveSettingsNow) { IniSectionSetIntEx(pIniSection, L"DefaultEncoding", Encoding_MapIniSetting(FALSE, iDefaultEncoding), Encoding_MapIniSetting(FALSE, CPI_UTF8)); IniSectionSetBoolEx(pIniSection, L"SkipUnicodeDetection", bSkipUnicodeDetection, 1); IniSectionSetBoolEx(pIniSection, L"LoadANSIasUTF8", bLoadANSIasUTF8, 0); + IniSectionSetBoolEx(pIniSection, L"LoadASCIIasUTF8", bLoadASCIIasUTF8, 1); IniSectionSetBoolEx(pIniSection, L"LoadNFOasOEM", bLoadNFOasOEM, 1); IniSectionSetBoolEx(pIniSection, L"NoEncodingTags", bNoEncodingTags, 0); IniSectionSetIntEx(pIniSection, L"DefaultEOLMode", iDefaultEOLMode, 0);