mirror of
https://github.com/vim/vim.git
synced 2025-09-23 03:43:49 -04:00
updated for version 7.4.187
Problem: Delete that crosses line break splits multi-byte character. Solution: Advance a character instead of a byte. (Cade Foster)
This commit is contained in:
13
src/normal.c
13
src/normal.c
@@ -21,7 +21,7 @@
|
||||
static int resel_VIsual_mode = NUL; /* 'v', 'V', or Ctrl-V */
|
||||
static linenr_T resel_VIsual_line_count; /* number of lines */
|
||||
static colnr_T resel_VIsual_vcol; /* nr of cols or end col */
|
||||
static int VIsual_mode_orig = NUL; /* type of Visual mode, that user entered */
|
||||
static int VIsual_mode_orig = NUL; /* saved Visual mode */
|
||||
|
||||
static int restart_VIsual_select = 0;
|
||||
#endif
|
||||
@@ -6202,8 +6202,17 @@ nv_left(cap)
|
||||
|| cap->oap->op_type == OP_CHANGE)
|
||||
&& !lineempty(curwin->w_cursor.lnum))
|
||||
{
|
||||
if (*ml_get_cursor() != NUL)
|
||||
char_u *cp = ml_get_cursor();
|
||||
|
||||
if (*cp != NUL)
|
||||
{
|
||||
#ifdef FEAT_MBYTE
|
||||
if (has_mbyte)
|
||||
curwin->w_cursor.col += (*mb_ptr2len)(cp);
|
||||
else
|
||||
#endif
|
||||
++curwin->w_cursor.col;
|
||||
}
|
||||
cap->retval |= CA_NO_ADJ_OP_END;
|
||||
}
|
||||
continue;
|
||||
|
@@ -154,6 +154,16 @@ ra test
|
||||
abba
|
||||
aab
|
||||
|
||||
STARTTEST
|
||||
:set whichwrap+=h
|
||||
/^x
|
||||
dh
|
||||
:set whichwrap-=h
|
||||
ENDTEST
|
||||
|
||||
á
|
||||
x
|
||||
|
||||
STARTTEST
|
||||
:let a = '.é.' " one char of two bytes
|
||||
:let b = '.é.' " normal e with composing char
|
||||
|
@@ -150,6 +150,9 @@ aaaa
|
||||
aaa
|
||||
|
||||
|
||||
áx
|
||||
|
||||
|
||||
byteidx
|
||||
[0, 1, 3, 4, -1]
|
||||
[0, 1, 4, 5, -1]
|
||||
|
@@ -738,6 +738,8 @@ static char *(features[]) =
|
||||
|
||||
static int included_patches[] =
|
||||
{ /* Add new patch number below this line */
|
||||
/**/
|
||||
187,
|
||||
/**/
|
||||
186,
|
||||
/**/
|
||||
|
Reference in New Issue
Block a user