Correction of 6362.1

FarGroup · Aug 24, 2024 · 11925f8 · 11925f8
1 parent 0ca6a57
commit 11925f8
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 5 deletions.
diff --git a/far/PluginA.cpp b/far/PluginA.cpp
@@ -788,7 +788,7 @@ static std::span<oldfar::PluginPanelItem> ConvertPanelItemsArrayToAnsi(std::span
 
 static void FreeUnicodePanelItem(PluginPanelItem *PanelItem, size_t ItemsNumber)
 {
-	FreePluginPanelItemsData(std::span(PanelItem, ItemsNumber));
+	FreePluginPanelItemsData({ PanelItem, ItemsNumber });
 
 	delete[] PanelItem;
 }

diff --git a/far/changelog b/far/changelog
@@ -1,3 +1,8 @@
+--------------------------------------------------------------------------------
+drkns 2024-08-24 11:06:55+01:00 - build 6364
+
+1. Correction of 6362.1.
+
 --------------------------------------------------------------------------------
 drkns 2024-08-24 00:55:19+01:00 - build 6363
 

diff --git a/far/colormix.cpp b/far/colormix.cpp
@@ -587,7 +587,7 @@ WORD FarColorToConsoleColor(const FarColor& Color)
 		const auto& Palette = console_palette();
 		static std::unordered_map<COLORREF, uint8_t> Map;
 
-		Result = color_to_palette_index(Color, LastColor, std::span(Palette.data(), index::nt_size), Map);
+		Result = color_to_palette_index(Color, LastColor, { Palette.data(), index::nt_size }, Map);
 
 		if (
 			Result.ForegroundIndex == Result.BackgroundIndex &&

diff --git a/far/console.cpp b/far/console.cpp
@@ -565,7 +565,7 @@ namespace console_detail
 		NONCOPYABLE(scoped_vt_input);
 
 		scoped_vt_input():
-			m_ConsoleMode(::console.UpdateMode(::console.GetInputHandle(), ENABLE_VIRTUAL_TERMINAL_INPUT, 0))
+			m_ConsoleMode(::console.UpdateMode(::console.GetInputHandle(), ENABLE_VIRTUAL_TERMINAL_INPUT, ENABLE_LINE_INPUT))
 		{
 		}
 

diff --git a/far/filestr.cpp b/far/filestr.cpp
@@ -346,7 +346,7 @@ static bool GetCpUsingML(std::string_view Str, uintptr_t& Codepage, function_ref
 	if (const auto Result = ML->DetectInputCodepage(MLDETECTCP_NONE, 0, const_cast<char*>(Str.data()), &Size, Info, &InfoCount); FAILED(Result))
 		return false;
 
-	const auto Scores = std::span(Info, InfoCount);
+	std::span const Scores(Info, InfoCount);
 	std::ranges::sort(Scores, [](DetectEncodingInfo const& a, DetectEncodingInfo const& b) { return a.nDocPercent > b.nDocPercent; });
 
 	const auto It = std::ranges::find_if(Scores, [&](DetectEncodingInfo const& i) { return i.nLangID != 0xffffffff && IsCodepageAcceptable(i.nCodePage); });

diff --git a/far/vbuild.m4 b/far/vbuild.m4
@@ -1 +1 @@
-6363
+6364