[FarGroup/FarManager] master: Correction of 6686 (0aaf651fa)

0 views
Skip to first unread message

farg...@farmanager.com

unread,
May 14, 2026, 8:31:37 PM (13 days ago) May 14
to farco...@googlegroups.com
Repository : https://github.com/FarGroup/FarManager
On branch : master
Link : https://github.com/FarGroup/FarManager/commit/0aaf651fa7b4f141c7b24e3deefe3ffcde3958d2

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

commit 0aaf651fa7b4f141c7b24e3deefe3ffcde3958d2
Author: Alex Alabuzhev <alab...@gmail.com>
Date: Fri May 15 01:17:54 2026 +0100

Correction of 6686


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

0aaf651fa7b4f141c7b24e3deefe3ffcde3958d2
far/changelog | 5 +++++
far/plugapi.cpp | 4 ++--
far/string_utils.cpp | 10 ----------
far/string_utils.hpp | 3 ---
far/vbuild.m4 | 2 +-
5 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/far/changelog b/far/changelog
index 3b99e38d9..68d6ce26a 100644
--- a/far/changelog
+++ b/far/changelog
@@ -1,3 +1,8 @@
+--------------------------------------------------------------------------------
+drkns 2026-05-15 01:17:17+01:00 - build 6687
+
+1. Correction of 6686.
+
--------------------------------------------------------------------------------
drkns 2026-05-15 00:41:46+01:00 - build 6686

diff --git a/far/plugapi.cpp b/far/plugapi.cpp
index 651e4f6c3..10bfb96ee 100644
--- a/far/plugapi.cpp
+++ b/far/plugapi.cpp
@@ -2024,7 +2024,7 @@ static void WINAPI apiStrUpper(wchar_t *s1) noexcept
return cpp_try(
[&]
{
- inplace::upper(s1);
+ inplace::upper({s1, std::wcslen(s1)});
});
}

@@ -2033,7 +2033,7 @@ static void WINAPI apiStrLower(wchar_t *s1) noexcept
return cpp_try(
[&]
{
- inplace::lower(s1);
+ inplace::lower({s1, std::wcslen(s1)});
});
}

diff --git a/far/string_utils.cpp b/far/string_utils.cpp
index d12ff27ec..2d0a307c8 100644
--- a/far/string_utils.cpp
+++ b/far/string_utils.cpp
@@ -115,16 +115,6 @@ void inplace::lower(wchar_t& Char)
lower({ &Char, 1 });
}

-void inplace::upper(wchar_t* Str)
-{
- upper({ Str, std::wcslen(Str) });
-}
-
-void inplace::lower(wchar_t* Str)
-{
- lower({ Str, std::wcslen(Str) });
-}
-
void inplace::upper(string& Str, size_t Pos, size_t Count)
{
upper({ Str.data() + Pos, Count == string::npos? Str.size() - Pos : Count });
diff --git a/far/string_utils.hpp b/far/string_utils.hpp
index 4e583c493..01ac5b373 100644
--- a/far/string_utils.hpp
+++ b/far/string_utils.hpp
@@ -75,9 +75,6 @@ namespace inplace
void upper(wchar_t& Char);
void lower(wchar_t& Char);

- void upper(wchar_t* Str);
- void lower(wchar_t* Str);
-
void upper(string& Str, size_t Pos = 0, size_t Count = string::npos);
void lower(string& Str, size_t Pos = 0, size_t Count = string::npos);
}
diff --git a/far/vbuild.m4 b/far/vbuild.m4
index cd560a3a8..734fd6707 100644
--- a/far/vbuild.m4
+++ b/far/vbuild.m4
@@ -1 +1 @@
-6686
+6687


Reply all
Reply to author
Forward
0 new messages