Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Build/Notepad3.ini
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ SettingsVersion=5
;NoCGIGuess=0
;NoCopyLineOnEmptySelection=0
;NoCutLineOnEmptySelection=0
;CopyMultiSelectionSeparator= ;(-> <use current EOL>) {use empty value for no separator}
;NoFadeHidden=0
;NoFileVariables=0
;NoHTMLGuess=0
Expand Down
3 changes: 3 additions & 0 deletions src/Config/Config.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1457,6 +1457,9 @@ void LoadSettings()
}
}

IniSectionGetString(IniSecSettings2, L"CopyMultiSelectionSeparator", L"\x01",
Settings2.CopyMultiSelectionSeparator, COUNTOF(Settings2.CopyMultiSelectionSeparator));

for (int i = 0; i < COUNTOF(Settings2.CodeFontPrefPrioList); ++i) {
if (i < COUNTOF(g_CodeFontPrioList))
Settings2.CodeFontPrefPrioList[i] = g_CodeFontPrioList[i];
Expand Down
16 changes: 13 additions & 3 deletions src/Edit.c
Original file line number Diff line number Diff line change
Expand Up @@ -3322,9 +3322,19 @@ void EditCopyMultiSelection(HWND hwnd)
return;
}
if (Sci_IsMultiSelection()) {
char pchSep[3] = { '\0' };
Sci_GetCurrentEOL_A(pchSep);
SciCall_SetCopySeparator(pchSep);
if (Settings2.CopyMultiSelectionSeparator[0] == L'\x01') {
// not set → use current EOL
char pchSep[3] = { '\0' };
Sci_GetCurrentEOL_A(pchSep);
SciCall_SetCopySeparator(pchSep);
} else {
// use configured separator (may be empty)
char chSep[MICRO_BUFFER * 2] = { '\0' };
WideCharToMultiByte(Encoding_SciCP, 0,
Settings2.CopyMultiSelectionSeparator, -1,
chSep, COUNTOF(chSep), NULL, NULL);
SciCall_SetCopySeparator(chSep);
}
}
SciCall_Copy();
}
Expand Down
2 changes: 2 additions & 0 deletions src/TypeDefs.h
Original file line number Diff line number Diff line change
Expand Up @@ -832,6 +832,8 @@ typedef struct SETTINGS2_T {

WCHAR HyperlinkFileProtocolVerb[MICRO_BUFFER];

WCHAR CopyMultiSelectionSeparator[MICRO_BUFFER];

const WCHAR* CodeFontPrefPrioList[MICRO_BUFFER];
const WCHAR* TextFontPrefPrioList[MICRO_BUFFER];

Expand Down
Loading