fix 4298

far/changelog

@@ -1,4 +1,8 @@
-w17 11.03.2015 15:50:45 +0300 - build 4302
+drkns 11.03.2015 20:07:31 +0200 - build 4303
+
+1. Уточнение 4298.
+
+w17 11.03.2015 15:50:45 +0300 - build 4302
 
 1. Устранение запроса повышения привилегий при посмотре файла на флэшке с NTFS под Win Server 2008 R2 SP1
 

far/editor.cpp

@@ -7115,13 +7115,6 @@ Editor::iterator Editor::InsertString(const wchar_t *lpwszStr, int nLength, iter
 	{
 		TopScreen = CurLine = NewLine;
 	}
-	else
-	{
-		if (Where == Lines.end())
-		{
-			WhereLineNumber = m_LinesCount-1;
-		}
-	}
 
 	m_LinesCount++;
 

far/editor.hpp

@@ -241,8 +241,8 @@ class Editor: public SimpleScreenObject
 	string VBlock2Text() { return VBlock2Text(nullptr, 0); }
 	void Change(EDITOR_CHANGETYPE Type,int StrNum);
 	DWORD EditSetCodePage(iterator edit, uintptr_t codepage, bool check_only);
-	iterator InsertString(const wchar_t *lpwszStr, int nLength, iterator Where, int WhereLineNumber = -1);
-	iterator PushString(const wchar_t* Str, size_t Size) { return InsertString(Str, static_cast<int>(Size), Lines.end()); }
+	iterator InsertString(const wchar_t *lpwszStr, int nLength, iterator Where, int WhereLineNumber);
+	iterator PushString(const wchar_t* Str, size_t Size) { return InsertString(Str, static_cast<int>(Size), Lines.end(), m_LinesCount); }
 	void TurnOffMarkingBlock();
 	void SwapState(Editor& swap_state);
 

far/vbuild.m4

@@ -1 +1 @@
-m4_define(BUILD,4302)m4_dnl
+m4_define(BUILD,4303)m4_dnl