[FarGroup/FarManager] master: Correction of 6619.2 (0bfb57acb)

[farg...@farmanager.com]

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

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

commit 0bfb57acbf39dcab1cc27e6d301fe118e50a424a
Author: Alex Alabuzhev <alab...@gmail.com>
Date: Sat Jan 3 19:06:46 2026 +0000

Correction of 6619.2


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

0bfb57acbf39dcab1cc27e6d301fe118e50a424a
far/changelog | 5 +++++
far/editor.cpp | 4 +++-
far/vbuild.m4 | 2 +-
3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/far/changelog b/far/changelog
index d15f9d32f..9beb80211 100644
--- a/far/changelog
+++ b/far/changelog
@@ -1,3 +1,8 @@
+--------------------------------------------------------------------------------
+drkns 2026-01-03 19:05:39+00:00 - build 6623
+
+1. Correction of 6619.2.
+
--------------------------------------------------------------------------------
drkns 2025-12-29 17:42:46+00:00 - build 6622

diff --git a/far/editor.cpp b/far/editor.cpp
index 7af1ae887..054b1ad61 100644
--- a/far/editor.cpp
+++ b/far/editor.cpp
@@ -3703,6 +3703,8 @@ void Editor::DoSearchReplace(const SearchReplaceDisposition Disposition)
if (TabCurPos + SearchLength + 8 > CurPtr->GetLeftPos() + ObjWidth())
CurPtr->SetLeftPos(TabCurPos + SearchLength + 8 - ObjWidth());

+ const auto CurLineCopy = m_it_CurLine;
+
if (!IsReplaceMode)
{
CurPtr->SetCurPos(m_FoundPos + (EdOpt.SearchCursorAtEnd? SearchLength : 0));
@@ -3866,7 +3868,7 @@ void Editor::DoSearchReplace(const SearchReplaceDisposition Disposition)
CurPos = m_it_CurLine->GetCurPos();
if (!Backward)
{
- if (Skip || !SearchLength)
+ if ((Skip || !SearchLength) && m_it_CurLine == CurLineCopy)
CurPos++;
}
else
diff --git a/far/vbuild.m4 b/far/vbuild.m4
index 4362762d9..0dd0a715d 100644
--- a/far/vbuild.m4
+++ b/far/vbuild.m4
@@ -1 +1 @@
-6622
+6623