diff --git a/far/changelog b/far/changelog index a10f391fe9..120e681e69 100644 --- a/far/changelog +++ b/far/changelog @@ -1,4 +1,8 @@ -drkns 17.05.2016 20:41:13 +0200 - build 4677 +zg 18.05.2016 19:37:11 +0200 - build 4678 + +1. при определённых условиях позиция курсора в текущей строке после ECTL_DELETESTRING была неверной. + +drkns 17.05.2016 20:41:13 +0200 - build 4677 1. Рефакторинг - добавим немного const. diff --git a/far/editor.cpp b/far/editor.cpp index 55f95313a9..9df26fc270 100644 --- a/far/editor.cpp +++ b/far/editor.cpp @@ -3022,7 +3022,9 @@ Editor::numbered_iterator Editor::DeleteString(numbered_iterator DelPtr, bool De return DelPtr; } + auto CurPos = m_it_CurLine->GetTabCurPos(); UpdateIterator(m_it_CurLine); + m_it_CurLine->SetTabCurPos(CurPos); UpdateIterator(m_it_AnyBlockStart); UpdateIterator(m_it_TopScreen); UpdateIterator(m_it_LastGetLine); diff --git a/far/vbuild.m4 b/far/vbuild.m4 index d64a2472a4..233c0b31c5 100644 --- a/far/vbuild.m4 +++ b/far/vbuild.m4 @@ -1 +1 @@ -m4_define(BUILD,4677)m4_dnl +m4_define(BUILD,4678)m4_dnl