This commit is contained in:
Daniel Hahler 2019-08-07 14:17:53 +02:00
parent e269c1028b
commit 564838159e

View File

@ -734,8 +734,8 @@ int del_bytes(colnr_T count, bool fixpos_arg, bool use_delcombine)
return FAIL; return FAIL;
} }
/* If 'delcombine' is set and deleting (less than) one character, only // If 'delcombine' is set and deleting (less than) one character, only
* delete the last combining character. */ // delete the last combining character.
if (p_deco && use_delcombine && enc_utf8 if (p_deco && use_delcombine && enc_utf8
&& utfc_ptr2len(oldp + col) >= count) { && utfc_ptr2len(oldp + col) >= count) {
int cc[MAX_MCO]; int cc[MAX_MCO];
@ -743,7 +743,7 @@ int del_bytes(colnr_T count, bool fixpos_arg, bool use_delcombine)
(void)utfc_ptr2char(oldp + col, cc); (void)utfc_ptr2char(oldp + col, cc);
if (cc[0] != NUL) { if (cc[0] != NUL) {
/* Find the last composing char, there can be several. */ // Find the last composing char, there can be several.
n = col; n = col;
do { do {
col = n; col = n;
@ -1731,7 +1731,7 @@ theend:
xfree(next_line); xfree(next_line);
xfree(allocated); xfree(allocated);
return retval; return retval;
} } // NOLINT(readability/fn_size)
/// Delete from cursor to end of line. /// Delete from cursor to end of line.
/// Caller must have prepared for undo. /// Caller must have prepared for undo.