editor replace fix

FarGroup · May 25, 2016 · 924a397 · 924a397
1 parent fa74de5
commit 924a397
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 12 deletions.
diff --git a/far/changelog b/far/changelog
@@ -1,3 +1,7 @@
+drkns 25.05.2016 20:16:03 +0200 - build 4693
+
+1. При [x] Cursor at the end неадекватно работала замена в редакторе, содержащая \t.
+
 zg 24.05.2016 13:58:55 +0200 - build 4692
 
 1. уточнение 4685.

diff --git a/far/editor.cpp b/far/editor.cpp
@@ -3697,7 +3697,7 @@ BOOL Editor::Search(int Next)
 								int I=0;
 								for (; SearchLength && I<static_cast<int>(strReplaceStrCurrent.size()); ++I, --SearchLength)
 								{
-									int Ch=strReplaceStrCurrent[I];
+									const auto Ch = strReplaceStrCurrent[I];
 
 									if (Ch==KEY_TAB)
 									{
@@ -3719,7 +3719,7 @@ BOOL Editor::Search(int Next)
 										ProcessKeyInternal(Manager::Key(KEY_DEL), RefreshMe);
 									}
 
-									if (Ch!=KEY_BS && !(Ch==KEY_DEL || Ch==KEY_NUMDEL))
+									if (Ch!=KEY_BS)
 										ProcessKeyInternal(Manager::Key(Ch), RefreshMe);
 								}
 
@@ -3732,9 +3732,9 @@ BOOL Editor::Search(int Next)
 
 									for (; I<static_cast<int>(strReplaceStrCurrent.size()); I++)
 									{
-										int Ch=strReplaceStrCurrent[I];
+										const auto Ch = strReplaceStrCurrent[I];
 										NeedUpdateCurPtr = Ch == KEY_ENTER;
-										if (Ch!=KEY_BS && !(Ch==KEY_DEL || Ch==KEY_NUMDEL))
+										if (Ch!=KEY_BS)
 											ProcessKeyInternal(Manager::Key(Ch), RefreshMe);
 									}
 								}
@@ -3774,13 +3774,13 @@ BOOL Editor::Search(int Next)
 									CurPtr->Select(LocalCurPos, LocalCurPos + static_cast<int>(strReplaceStrCurrent.size()));
 								}
 
-								if (at_end)
-									at_end = static_cast<int>(strReplaceStrCurrent.size());
-
 								Change(ECTYPE_CHANGED, m_it_CurLine.Number());
 								TextChanged(1);
 							}
 
+							if (at_end)
+								at_end = static_cast<int>(strReplaceStrCurrent.size());
+
 							Pasting--;
 						}
 					}

diff --git a/far/farlang.templ.m4 b/far/farlang.templ.m4
@@ -3574,11 +3574,11 @@ MEditConfigSelFound
 
 MEditConfigCursorAtEnd
 "Курсор в ко&нце"
-"Cu&rsor at end"
-upd:"Cursor at end"
+"Cu&rsor at the end"
+upd:"Cursor at the end"
 "Pfeile am Ende"
-upd:"Cursor at end"
-upd:"Cursor at end"
+upd:"Cursor at the end"
+upd:"Cursor at the end"
 "Cursor al final"
 "Kurzor na konci"
 "Cursore Alla &Fine"

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