Skip to content

Commit 6cf8ba6

Browse files
deep-softdeep-soft
authored
Merge branch 'FarGroup:master' into master
2 parents 21a5899 + 5c2d55b commit 6cf8ba6

29 files changed

Lines changed: 277 additions & 106 deletions

‎enc/enc_rus/meta/service_functions/editor.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ <h3>Параметры</h3>
7474
<td class="cont" width="60%">При открытии файла запретить редактирование. Пользователь сможет снять блокировку с помощью клавиш <kbd>Ctrl</kbd>+<kbd>L</kbd>.</td></tr>
7575
<tr class="cont"><td class="cont" width="40%"><a name="EF_DISABLESAVEPOS">EF_DISABLESAVEPOS</a></td>
7676
<td class="cont" width="60%">Не сохранять позицию в редактируемом файле.</td></tr>
77-
<tr class="cont"><td class="cont" width="40%"><a name="EN_NONE">EN_NONE</a></td>
77+
<tr class="cont"><td class="cont" width="40%"><a name="EF_NONE">EF_NONE</a></td>
7878
<td class="cont" width="60%">Нулевой флаг.</td></tr>
7979

8080
<tr class="cont"><td class="cont" width="40%"><a name="EF_OPENMODE_MASK">EF_OPENMODE_MASK</a></td>

‎enc/enc_rus/meta/structures/farmacrovalue.html‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ <h1>FarMacroValue</h1>
2929
__int64 Boolean;
3030
double Double;
3131
const wchar_t *String;
32+
const char *MBString;
3233
void *Pointer;
3334
struct
3435
{
@@ -59,7 +60,9 @@ <h3>Элементы</h3>
5960
<tr class="cont"><td class="cont" width="40%"><a name="FMVT_INTEGER">FMVT_INTEGER</a></td>
6061
<td class="cont" width="60%">Число. Компонента <code>Value.Integer</code>.</td></tr>
6162
<tr class="cont"><td class="cont" width="40%"><a name="FMVT_STRING">FMVT_STRING</a></td>
62-
<td class="cont" width="60%">Строка. Компонента <code>Value.String</code>.</td></tr>
63+
<td class="cont" width="60%">Строка в кодировке UTF-16. Компонента <code>Value.String</code>.</td></tr>
64+
<tr class="cont"><td class="cont" width="40%"><a name="FMVT_MBSTRING">FMVT_MBSTRING</a></td>
65+
<td class="cont" width="60%">Строка в кодировке UTF-8. Компонента <code>Value.MBString</code>.</td></tr>
6366
<tr class="cont"><td class="cont" width="40%"><a name="FMVT_DOUBLE">FMVT_DOUBLE</a></td>
6467
<td class="cont" width="60%">Вещественное значение. Компонента <code>Value.Double</code>.</td></tr>
6568
<tr class="cont"><td class="cont" width="40%"><a name="FMVT_BOOLEAN">FMVT_BOOLEAN</a></td>

‎far/FarPol.hlf.m4‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6607,21 +6607,21 @@ w Edytorze.
66076607

66086608
@Editor.SearchAllUseAltFileNameFormat
66096609
$ #far:config Editor.SearchAllUseAltFileNameFormat#
6610-
This string parameter controls composing of the file name used by the
6611-
new Editor containing ~all matching entries~@FindAllMenu@. The value
6612-
is one or more ~file masks~@FileMasks@.
6610+
Ten parametr łańcuchowy kontroluje tworzenie nazwy pliku używanej przez
6611+
nowy Edytor zawierający ~wszystkie pasujące wpisy~@FindAllMenu@.
6612+
Wartością jest jedna lub więcej ~masek plików~@FileMasks@.
66136613

6614-
The new filename is created from the stem filename and the extension
6615-
of the file currently opened in the Editor. Depending on the original
6616-
file name, the new file name is formatted using one of the two
6617-
alternative UI format strings defined in ~.lng files~@CustomizingUI@.
6618-
The string with the ID #MEditSearchAllFileNameFormatAlt# is used if the
6619-
original file name matches one of the file masks; otherwise,
6620-
#MEditSearchAllFileNameFormat# is used.
6614+
Nowa nazwa pliku jest tworzona wg nazwy podstawowego pliku i rozszerzenia
6615+
pliku aktualnie otwartego w edytorze. W zależoności od oryginalnej nazwy
6616+
pliku, nowa nazwa jest formatowana przy użyciu jednego z dwóch alternatywnych
6617+
ciągów zdefiniowanych w ~plikach .lng~@CustomizingUI@.
6618+
Łańcuch o identyfikatorze #MEditSearchAllFileNameFormatAlt# jest używany,
6619+
jeżeli oryginalna nazwa pliku pasuje do jednej z masek plików;
6620+
w przeciwnym razie używany jest identyfikator #MEditSearchAllFileNameFormat#.
66216621

6622-
Default value: #*.txt,*.log,*.md,*.csv,*.ini,*.cmd,*.map#
6622+
Wartość domyślna: #*.txt,*.log,*.md,*.csv,*.ini,*.cmd,*.map#
66236623

6624-
This parameter can be changed via ~far:config~@FarConfig@ only.
6624+
Parametr też można zmienić tylko w ~far:config~@FarConfig@.
66256625

66266626

66276627
@Panel.ShortcutAlwaysChdir
@@ -6890,17 +6890,17 @@ tworzenia, usuwania lub zmiany nazw folderów.
68906890

68916891
@Panel.TreatDotFilesAsHidden
68926892
$ #far:config Panel.TreatDotFilesAsHidden#
6893-
This Boolean parameter controls the filtering of files or folders
6894-
starting with a dot (“dotfiles”). It works in combination with the
6895-
#Show hidden and system files# option in the
6896-
~panel settings~@PanelSettings@ dialog.
6893+
Ten parametr logiczny kontroluje filtrowanie plików lub folderów rozpoczynających się
6894+
od kropki (“dotfiles”). Działa w połączeniu z opcją #Pokazuj pliki ukryte i systemowe#
6895+
w oknie ~ustawień panelu~@PanelSettings@.
68976896

6898-
False - ^<wrap>Dotfiles will always be shown.
6899-
True - Dotfiles will be hidden/shown together with the Hidden and System files.
6897+
Fałsz - ^<wrap>Pliki zaczynające się kropkami zawsze będę widoczne.
6898+
Prawda - Pliki zaczynające się kropkami będą ukrywane/wyświetlane razem z plikami
6899+
ukrytymi i systemowymi.
69006900

6901-
Default value: False (Dotfiles will always be shown.)
6901+
Domyślna wartość: Fałsz (pliki zawsze będą wyświetlane.)
69026902

6903-
This parameter can be changed via ~far:config~@FarConfig@ only.
6903+
Ten parametr można zmienić tylko w ~far:config~@FarConfig@.
69046904

69056905

69066906
@Index

‎far/changelog‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,47 @@
1+
--------------------------------------------------------------------------------
2+
shmuel 2025-10-24 20:22:16+03:00 - build 6576
3+
4+
1. Add a few stack operations to Macro-API engine.
5+
6+
--------------------------------------------------------------------------------
7+
drkns 2025-10-20 23:56:08+01:00 - build 6575
8+
9+
1. Clarify DI_COMBOBOX and DIF_DROPDOWNLIST behavior in corner cases.
10+
11+
2. Refactoring.
12+
13+
3. Warnings.
14+
15+
--------------------------------------------------------------------------------
16+
rohitab 2025-10-20 08:50:41+11:00 - build 6574
17+
18+
1. gh-1032: Crash if size of name column is less than size of mark character.
19+
20+
--------------------------------------------------------------------------------
21+
drkns 2025-10-16 23:42:46+01:00 - build 6573
22+
23+
1. Continue gh-1031.
24+
Save the history if the user touched the control or if the control is visible.
25+
26+
--------------------------------------------------------------------------------
27+
drkns 2025-10-16 20:22:16+01:00 - build 6572
28+
29+
1. gh-1031: History saved for hidden edit controls.
30+
Only save the history if the user touched the control.
31+
32+
2. Minor fix in color processing.
33+
34+
--------------------------------------------------------------------------------
35+
zg 2025-10-05 23:11:22+03:00 - build 6571
36+
37+
1. selection drawn incorrectly in viewer in dump mode.
38+
39+
--------------------------------------------------------------------------------
40+
drkns 2025-10-04 21:05:17+01:00 - build 6570
41+
42+
1. gh-939: ECSTATE_SAVED / ECSTATE_MODIFIED changed their meaning.
43+
The original meaning restored (more or less).
44+
145
--------------------------------------------------------------------------------
246
drkns 2025-10-04 00:00:33+01:00 - build 6569
347

‎far/colormix.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -304,8 +304,6 @@ namespace colors
304304

305305
auto Result = Bottom;
306306

307-
flags::clear(Result.Flags, FCF_FOREIGN);
308-
309307
const auto merge_part = [&](COLORREF FarColor::*ColorAccessor, const FARCOLORFLAGS Flag)
310308
{
311309
const auto TopValue = std::invoke(ColorAccessor, Top);
@@ -314,6 +312,8 @@ namespace colors
314312
if (is_transparent(TopValue))
315313
return;
316314

315+
flags::clear(Result.Flags, FCF_FOREIGN);
316+
317317
auto& ResultValue = std::invoke(ColorAccessor, Result);
318318

319319
// Simple case

‎far/common/2d/algorithm.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3636
#include "rectangle.hpp"
3737
#include "../function_traits.hpp"
3838

39-
#include <limits>
39+
#include <utility>
4040

4141
//----------------------------------------------------------------------------
4242

@@ -58,8 +58,8 @@ void for_submatrix(auto& Matrix, rectangle Rect, P Predicate)
5858
template<typename T, size_t Width, size_t Height>
5959
static consteval auto column_major_iota()
6060
{
61-
std::array<T, Width* Height> Result;
62-
static_assert(Result.size() - 1 <= std::numeric_limits<T>::max());
61+
std::array<T, Width * Height> Result;
62+
static_assert(std::in_range<T>(Result.size() - 1));
6363

6464
for (size_t Row = 0; Row != Height; ++Row)
6565
for (size_t Col = 0; Col != Width; ++Col)

‎far/common/from_string.hpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3636
#include "expected.hpp"
3737
#include "string_utils.hpp"
3838

39-
#include <limits>
4039
#include <system_error>
4140
#include <utility>
4241

@@ -112,7 +111,7 @@ namespace detail
112111
if (const auto Result = from_string(Str, LongValue, Pos, Base); Result != std::errc{})
113112
return Result;
114113

115-
if (LongValue < std::numeric_limits<S>::min() || LongValue > std::numeric_limits<S>::max())
114+
if (!std::in_range<S>(LongValue))
116115
return std::errc::result_out_of_range;
117116

118117
Value = static_cast<S>(LongValue);

0 commit comments

Comments
 (0)