[FarGroup/FarManager] master: Continue 6684.1 (ad42fdda6)

[farg...@farmanager.com]

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

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

commit ad42fdda6ac999cba971fee5eff740fc8fe96f28
Author: Alex Alabuzhev <alab...@gmail.com>
Date: Tue May 12 22:05:43 2026 +0100

Continue 6684.1


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

ad42fdda6ac999cba971fee5eff740fc8fe96f28
far/changelog | 5 +++++
far/findfile.cpp | 13 ++++---------
far/vbuild.m4 | 2 +-
3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/far/changelog b/far/changelog
index 44684cba7..f8060fb09 100644
--- a/far/changelog
+++ b/far/changelog
@@ -1,3 +1,8 @@
+--------------------------------------------------------------------------------
+drkns 2026-05-12 22:05:18+01:00 - build 6685
+
+1. Continue 6684.1.
+
--------------------------------------------------------------------------------
drkns 2026-05-12 21:14:58+01:00 - build 6684

diff --git a/far/findfile.cpp b/far/findfile.cpp
index e74e6f4cb..3e7fcac02 100644
--- a/far/findfile.cpp
+++ b/far/findfile.cpp
@@ -1286,17 +1286,12 @@ bool background_searcher::LookForString(string_view const FileName)
}
}

- if (SearchInFirst && alreadyRead >= SearchInFirst)
+ if (IsLastBlock || (SearchInFirst && alreadyRead >= SearchInFirst))
return false;

- // Если мы потенциально прочитали не весь файл
- if (!IsLastBlock)
- {
- // Отступаем назад на длину слова поиска минус 1
- if (!File.SetPointer(-StepBackOffset, nullptr, FILE_CURRENT))
- return false;
- alreadyRead -= StepBackOffset;
- }
+ if (!File.SetPointer(-StepBackOffset, nullptr, FILE_CURRENT))
+ return false;
+ alreadyRead -= StepBackOffset;
}

return false;
diff --git a/far/vbuild.m4 b/far/vbuild.m4
index 23285f18d..a7bb2e831 100644
--- a/far/vbuild.m4
+++ b/far/vbuild.m4
@@ -1 +1 @@
-6684
+6685