viewer search bugs

FarGroup · Aug 23, 2016 · 45c679e · 45c679e
1 parent 477fd22
commit 45c679e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/far/changelog b/far/changelog
@@ -1,3 +1,9 @@
+drkns 23.08.2016 11:20:47 +0200 - build 201
+
+1. Не работал поиск в UTF8-файлах во вьювере.
+
+2. Там же - криво работал поиск по регулярным выражениям.
+
 drkns 22.08.2016 22:01:40 +0200
 
 1. GCC 6.

diff --git a/far/encoding.cpp b/far/encoding.cpp
@@ -706,7 +706,7 @@ size_t Utf8::get_chars(const char* const Data, size_t const DataSize, wchar_t* c
 	}
 
 	Tail = DataEnd - DataIterator;
-	return BufferEnd - BufferIterator;
+	return BufferIterator - Buffer;
 }
 
 size_t Utf8::get_chars(const char* const Data, size_t const DataSize, wchar_t* const Buffer, size_t const BufferSize, Utf::errors* const Errors)

diff --git a/far/vbuild.m4 b/far/vbuild.m4
@@ -1 +1 @@
-m4_define(BUILD,4764)m4_dnl
+m4_define(BUILD,4765)m4_dnl
diff --git a/far/viewer.cpp b/far/viewer.cpp
@@ -3233,7 +3233,7 @@ SEARCHER_RESULT Viewer::search_regex_forward(search_data* sd)
 		else // found
 		{
 			sd->MatchPos = fpos;
-			sd->search_len = GetStrBytesNum(t_line+off, m[0].end - m[0].start);
+			sd->search_len = GetStrBytesNum(t_line + off + m[0].start, m[0].end - m[0].start);
 			return Search_Found;
 		}
 	}