Skip to content

Commit

Permalink
MacroAPI/Panel.Select: use Far3 specification
Browse files Browse the repository at this point in the history
  • Loading branch information
shmuz committed Jan 4, 2025
1 parent 2815a6d commit 429e738
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions far/src/macro/macroapi.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1719,8 +1719,8 @@ int FarMacroApi::panelselectFunc()
if (Mode == 2 || Mode == 3)
{
strStr=ValItems.s();
ReplaceStrings(strStr,L"\r\n",L";");
ReplaceStrings(strStr,L"\n",L";");
ReplaceStrings(strStr, L"\r", L"\n");
ReplaceStrings(strStr, L"\n\n", L"\n");
}

MacroPanelSelect mps;
Expand Down
2 changes: 1 addition & 1 deletion far/src/mix/udlist.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ class UserDefinedList : private NonCopyable
// mUnique=mSort=false

// Явно указываются разделители. См. описание SetParameters
UserDefinedList(DWORD Flags=0, wchar_t separator1=L';', wchar_t separator2=L',');
UserDefinedList(DWORD Flags=0, wchar_t separator1=0, wchar_t separator2=0);
~UserDefinedList() {}

public:
Expand Down
2 changes: 1 addition & 1 deletion far/src/panels/filelist.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -837,7 +837,7 @@ int64_t FileList::VMProcess(int OpCode,void *vParam,int64_t iParam)
if (mps->Mode == ps_mode::position && (DWORD)mps->Index >= (DWORD)FileCount)
return Result;

UserDefinedList itemsList(ULF_UNIQUE);
UserDefinedList itemsList(ULF_UNIQUE|ULF_CASESENSITIVE, L'\n');

if (mps->Action != ps_action::restore)
{
Expand Down

0 comments on commit 429e738

Please sign in to comment.