More #3481

far/changelog

@@ -1,3 +1,7 @@
+drkns 12.09.2017 21:04:02 +0100 - build 5028
+
+1. Продолжение 0003481.
+
 drkns 11.09.2017 20:45:30 +0100 - build 5027
 
 1. 0003481: hlf: Текст может выравниваться не смотря на отсутствие <CtrlStartPosChar>

far/help.cpp

@@ -353,6 +353,7 @@ bool Help::ReadHelp(const string& Mask)
 	// Keeping them together to prevent overwriting paragraph-specific StartPos
 	// with the one from the next paragraph, if any.
 	std::pair<string, size_t> SplitLine;
+	bool SplitLineBegin = false;
 
 	const auto& AddSplitLine = [this](const std::pair<string, size_t>& Line)
 	{
@@ -608,6 +609,7 @@ bool Help::ReadHelp(const string& Mask)
 								if (StringLen(strReadStr) + StartPos < MaxLength)
 								{
 									AddLine(strReadStr, StartPos);
+									StartPos = 0;
 									continue;
 								}
 							}
@@ -646,6 +648,8 @@ bool Help::ReadHelp(const string& Mask)
 							}
 
 							SplitLine = { strReadStr, StartPos };
+							SplitLineBegin = true;
+
 							strReadStr.clear();
 							continue;
 						}
@@ -701,7 +705,8 @@ bool Help::ReadHelp(const string& Mask)
 							string FirstPart = SplitLine.first.substr(0, I);
 							if (StringLen(FirstPart) + SplitLine.second < MaxLength)
 							{
-								AddLine(FirstPart, SplitLine.second);
+								AddLine(FirstPart, SplitLineBegin? 0 : SplitLine.second);
+								SplitLineBegin = false;
 								SplitLine.first.erase(1, I);
 								SplitLine.first[0] = L' ';
 								HighlightsCorrection(SplitLine.first);

far/vbuild.m4

@@ -1 +1 @@
-m4_define(BUILD,5027)m4_dnl
+m4_define(BUILD,5028)m4_dnl