Merge remote-tracking branch 'upstream/master' into Dev_NewFeatures

This commit is contained in:
RaiKoHoff 2020-07-22 09:14:59 +02:00
commit d2bdbf2a79
2 changed files with 2 additions and 2 deletions

View File

@ -3884,7 +3884,7 @@ void EditStripLastCharacter(HWND hwnd, bool bIgnoreSelection, bool bTrailingBlan
{
UNUSED(hwnd);
if (SciCall_IsSelectionEmpty() && !bIgnoreSelection) { return; }
if (SciCall_IsSelectionEmpty() && !(bIgnoreSelection || bTrailingBlanksOnly)) { return; }
DocPos const iSelStart = (SciCall_IsSelectionEmpty() || bIgnoreSelection) ? 0 : SciCall_GetSelectionStart();
DocPos const iSelEnd = (SciCall_IsSelectionEmpty() || bIgnoreSelection) ? Sci_GetDocEndPosition() : SciCall_GetSelectionEnd();

View File

@ -4308,7 +4308,7 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
case IDM_EDIT_PADWITHSPACES:
EditPadWithSpaces(Globals.hwndEdit,false,false);
EditPadWithSpaces(Globals.hwndEdit, false, false);
break;