[FarGroup/FarManager] master: Correction of 6629 (065df55a0)

0 views
Skip to first unread message

farg...@farmanager.com

unread,
Jan 11, 2026, 4:00:57 PM (5 days ago) Jan 11
to farco...@googlegroups.com
Repository : https://github.com/FarGroup/FarManager
On branch : master
Link : https://github.com/FarGroup/FarManager/commit/065df55a0e3b23c889396df42aca3ad2373283fd

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

commit 065df55a0e3b23c889396df42aca3ad2373283fd
Author: Alex Alabuzhev <alab...@gmail.com>
Date: Sun Jan 11 20:35:50 2026 +0000

Correction of 6629


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

065df55a0e3b23c889396df42aca3ad2373283fd
far/changelog | 5 +++++
far/message.cpp | 7 ++++++-
far/vbuild.m4 | 2 +-
3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/far/changelog b/far/changelog
index 7c1d396e8..842c05bf3 100644
--- a/far/changelog
+++ b/far/changelog
@@ -1,3 +1,8 @@
+--------------------------------------------------------------------------------
+drkns 2026-01-11 20:35:34+00:00 - build 6631
+
+1. Correction of 6629.
+
--------------------------------------------------------------------------------
drkns 2026-01-11 16:51:41+00:00 - build 6630

diff --git a/far/message.cpp b/far/message.cpp
index afd003e87..113ac49b9 100644
--- a/far/message.cpp
+++ b/far/message.cpp
@@ -242,14 +242,18 @@ static message_result MessageImpl(
append(strClipText, Eol);

if (!Strings.empty())
+ {
Strings.emplace_back(L"\x1"sv);
+ StringLengths.emplace_back(1);
+ }

const auto add_wrapped = [&](string_view const Str)
{
for (const auto& i : wrapped_text(Str, MAX_MESSAGE_WIDTH))
{
Strings.emplace_back(i);
- MaxLength = std::max(MaxLength, visual_string_length(i));
+ StringLengths.emplace_back(visual_string_length(i));
+ MaxLength = std::max(MaxLength, StringLengths.back());
}
};

@@ -387,6 +391,7 @@ static message_result MessageImpl(
MsgDlg[MsgDlg.size() - ButtonsCount].Flags |= DIF_DEFAULTBUTTON | DIF_FOCUS;

clear_and_shrink(Strings);
+ clear_and_shrink(StringLengths);
clear_and_shrink(Buttons);

const auto Dlg = Dialog::create(MsgDlg, std::bind_front(&message_context::DlgProc, &Context), &strClipText);
diff --git a/far/vbuild.m4 b/far/vbuild.m4
index 5affb3034..8fa7a243e 100644
--- a/far/vbuild.m4
+++ b/far/vbuild.m4
@@ -1 +1 @@
-6630
+6631


Reply all
Reply to author
Forward
0 new messages