[FarGroup/FarManager] master: Correction of 6663.2 (d3fe82010)

0 views
Skip to first unread message

farg...@farmanager.com

unread,
Mar 21, 2026, 7:46:01 PM (6 days ago) Mar 21
to farco...@googlegroups.com
Repository : https://github.com/FarGroup/FarManager
On branch : master
Link : https://github.com/FarGroup/FarManager/commit/d3fe8201004703eecead4df3cbe103253e6bbbe8

>---------------------------------------------------------------

commit d3fe8201004703eecead4df3cbe103253e6bbbe8
Author: Alex Alabuzhev <alab...@gmail.com>
Date: Sat Mar 21 23:35:23 2026 +0000

Correction of 6663.2


>---------------------------------------------------------------

d3fe8201004703eecead4df3cbe103253e6bbbe8
far/changelog | 5 +++++
far/console.cpp | 13 ++++++-------
far/vbuild.m4 | 2 +-
3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/far/changelog b/far/changelog
index 6f17732b6..e90b70eb2 100644
--- a/far/changelog
+++ b/far/changelog
@@ -1,3 +1,8 @@
+--------------------------------------------------------------------------------
+drkns 2026-03-21 23:34:45+00:00 - build 6664
+
+1. Correction of 6663.2.
+
--------------------------------------------------------------------------------
drkns 2026-03-20 21:54:19+00:00 - build 6663

diff --git a/far/console.cpp b/far/console.cpp
index 10a84eabb..d51dee083 100644
--- a/far/console.cpp
+++ b/far/console.cpp
@@ -1910,7 +1910,7 @@ protected:
if (const auto Area = SubRect.width() * SubRect.height(); Area > 4)
Str.reserve(std::max(1024, Area * 2));

- auto LastColor = sDefaultVtColor;
+ auto LastColor = colors::default_color();

point ViewportSize;
{
@@ -1940,7 +1940,7 @@ protected:
// Words cannot describe how much I despise VT.

// Save cursor position
- Str = ANSISYSSC L""sv;
+ Str = CSI "m" ANSISYSSC L""sv;

foreign_blocks_list ForeignBlocksList;

@@ -1952,13 +1952,12 @@ protected:
ANSISYSRC // Restore cursor position
CSI L"1B" // Move cursor down
ANSISYSSC // Save again
- L""sv;

- // conhost used to preserve colors after ANSISYSRC, but it is not the case anymore (see terminal#14612)
- // Explicitly reset them here for consistency across implementations.
- Str += sDefaultVtColorStr;
+ // conhost used to preserve colors after ANSISYSRC, but it is not the case anymore (see terminal#14612)
+ // Explicitly reset them here for consistency across implementations.
+ CSI L"m"sv;

- LastColor = sDefaultVtColor;
+ LastColor = colors::default_color();
}

const auto BlockRow = Buffer[i].subspan(SubRect.left, SubRect.width());
diff --git a/far/vbuild.m4 b/far/vbuild.m4
index cb96292ea..23083da15 100644
--- a/far/vbuild.m4
+++ b/far/vbuild.m4
@@ -1 +1 @@
-6663
+6664


Reply all
Reply to author
Forward
0 new messages