1. 0003367: Undo оставляет пробелы, которых не было.

FarGroup · Dec 16, 2016 · f54e43c · f54e43c
1 parent 8fe72b3
commit f54e43c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/far/changelog b/far/changelog
@@ -1,3 +1,7 @@
+zg 17.12.2016 01:01:39 +0200 - build 4870
+
+1. 0003367: Undo оставляет пробелы, которых не было.
+
 drkns 14.12.2016 01:41:17 +0200 - build 4869
 
 1. 0003353: Ошибка отрисовки при выходе машины из спячки.

diff --git a/far/editor.cpp b/far/editor.cpp
@@ -2563,10 +2563,14 @@ bool Editor::ProcessKeyInternal(const Manager::Key& Key, bool& Refresh)
 				}
 
 				const auto& Str = m_it_CurLine->GetString();
+				string CmpStr;
 
-				intptr_t LocalCurPos = m_it_CurLine->GetCurPos();
+				if (!SkipCheckUndo)
+				{
+					CmpStr = Str;
+				}
 
-				if (IsCharKey(LocalKey()) && LocalCurPos>0 && Str.empty())
+				if (IsCharKey(LocalKey()) && m_it_CurLine->GetCurPos()>0 && Str.empty())
 				{
 					auto PrevLine = m_it_CurLine == Lines.begin()? Lines.end() : std::prev(m_it_CurLine);
 
@@ -2613,14 +2617,6 @@ bool Editor::ProcessKeyInternal(const Manager::Key& Key, bool& Refresh)
 					}
 				}
 
-				string CmpStr;
-
-				if (!SkipCheckUndo)
-				{
-					LocalCurPos=m_it_CurLine->GetCurPos();
-					CmpStr = Str;
-				}
-
 				if (LocalKey() == KEY_OP_XLAT)
 				{
 					Xlat();

diff --git a/far/vbuild.m4 b/far/vbuild.m4
@@ -1 +1 @@
-m4_define(BUILD,4869)m4_dnl
+m4_define(BUILD,4870)m4_dnl