CodeCow/Notepad3
1
0
Fork 0
mirror of https://github.com/rizonesoft/Notepad3.git synced 2026-06-11 21:03:05 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: remove too strong UTF-8 affinity

Browse Source
This commit is contained in:
METANEOCORTEX\Kotti 2026-03-11 23:51:40 +01:00
parent c702006c3a
commit c61381e99d
2 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Edit.c
View File

@ -1465,12 +1465,6 @@ bool EditLoadFile(
status->iEncoding = CPI_UTF8;
EditDetectEOLMode(lpData, cbData, status);
}
}
else if (!IS_ENC_ENFORCED() && encDetection.bPureASCII7Bit) {
// load ASCII(7-bit) as ANSI/UTF-8
EditSetNewText(hwnd, lpData, cbData, bClearUndoHistory, bReloadFile);
status->iEncoding = (Settings.LoadASCIIasUTF8 ? CPI_UTF8 : CPI_ANSI_DEFAULT);
EditDetectEOLMode(lpData, cbData, status);
} else { // === ALL OTHER NON UTF-8 ===

7
src/EncodingDetection.cpp
View File

@ -1239,9 +1239,6 @@ extern "C" ENC_DET_T Encoding_DetectEncoding(const HPATHL hpath, const char* lpD
encDetRes.analyzedEncoding = iAnalyzeHint;
encDetRes.confidence = (1.0f - Settings2.AnalyzeReliableConfidenceLevel);
}
else if (encDetRes.bPureASCII7Bit && encDetRes.bValidUTF8) {
encDetRes.analyzedEncoding = CPI_UTF8;
}
if (!bSkipUTFDetection) {
@ -1306,12 +1303,12 @@ extern "C" ENC_DET_T Encoding_DetectEncoding(const HPATHL hpath, const char* lpD
encDetRes.Encoding = encDetRes.analyzedEncoding;
}
}
else if (!encDetRes.bIsAnalysisReliable && Encoding_IsValid(encDetRes.analyzedEncoding))
else if (!encDetRes.bIsAnalysisReliable && (Encoding_IsValid(encDetRes.analyzedEncoding) || encDetRes.bPureASCII7Bit))
{
// UCHARDET below confidence threshold (UseReliableCEDonly is true)
encDetRes.Encoding = encDetRes.bValidUTF8 ? CPI_UTF8 : CPI_ANSI_DEFAULT;
}
else if (Encoding_IsUNICODE(encDetRes.unicodeAnalysis) && (iConfidence > 66))
else if (Encoding_IsUNICODE(encDetRes.unicodeAnalysis) && (iConfidence > 50))
{
// unicodeAnalysis (IsTextUnicode) confirms Unicode structure,
// iConfidence is from UCHARDET analysis — use analyzedEncoding (intentional)