[FarGroup/FarManager] master: gh-1103 (0ddab6b83)

[farg...@farmanager.com]

Repository : https://github.com/FarGroup/FarManager
On branch : master
Link : https://github.com/FarGroup/FarManager/commit/0ddab6b83b7b399da45af0a022f509eec89fedb9

>---------------------------------------------------------------

commit 0ddab6b83b7b399da45af0a022f509eec89fedb9
Author: w17 <vladimir....@gmail.com>
Date: Fri May 29 02:04:41 2026 +0300

gh-1103


>---------------------------------------------------------------

0ddab6b83b7b399da45af0a022f509eec89fedb9
far/changelog | 5 +++++
far/filestr.cpp | 8 ++++----
far/vbuild.m4 | 2 +-
3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/far/changelog b/far/changelog
index 6f4bd950a..fd51a7d67 100644
--- a/far/changelog
+++ b/far/changelog
@@ -1,3 +1,8 @@
+--------------------------------------------------------------------------------
+w17 2026-05-29 02:00:15+03:00 - build 6689
+
+1. Correction of 6688
+
--------------------------------------------------------------------------------
w17 2026-05-28 13:40:37+03:00 - build 6688

diff --git a/far/filestr.cpp b/far/filestr.cpp
index e5d986794..656b5d07e 100644
--- a/far/filestr.cpp
+++ b/far/filestr.cpp
@@ -435,10 +435,10 @@ static bool GetCpUsingML(std::string_view Str, uintptr_t& Codepage, function_ref
std::ranges::sort(Scores, [](DetectEncodingInfo const& a, DetectEncodingInfo const& b) { return a.nDocPercent > b.nDocPercent; });

const auto no_cjk = !Global || Global->Opt->NoAutoDetectCJK; // Global == nullptr in TEST_CASE("GetCpUsingML_M4000")
- const auto is_cp_acceptable = [no_cjk, IsCodepageAcceptable](const UINT cp) {
- return (cp != 0xffffffff) && !(no_cjk && cp >= 932 && cp <= 950) && IsCodepageAcceptable(cp);
- };
- const auto It = std::ranges::find_if(Scores, [&](DetectEncodingInfo const& i) { return is_cp_acceptable(i.nCodePage); });
+
+ const auto It = std::ranges::find_if(Scores, [&](DetectEncodingInfo const& i) {
+ return (i.nLangID != 0xffffffff) && !(no_cjk && i.nCodePage >= 932 && i.nCodePage <= 950) && IsCodepageAcceptable(i.nCodePage);
+ });
if (It == Scores.end())
return false;

diff --git a/far/vbuild.m4 b/far/vbuild.m4
index f7bd8cc28..87349c6b6 100644
--- a/far/vbuild.m4
+++ b/far/vbuild.m4
@@ -1 +1 @@
-6688
+6689