aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-24 10:45:12 -04:00
Code

patch 8.2.3580: gj does not move properly with a wide character

Browse Source 
Problem:    gj does not move properly with a wide character.
Solution:   Move one to the right. (Christian Brabandt, closes #8702)
This commit is contained in:
Christian Brabandt 2021-11-04 13:28:29 +00:00 committed by Bram Moolenaar
parent 4b2c804767
commit aaec1d4fb1
3 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/normal.c
View File

@ -2530,7 +2530,7 @@ nv_screengo(oparg_T *oap, int dir, long dist)
int col_off1; // margin offset for first screen line
int col_off2; // margin offset for wrapped screen line
int width1; // text width for first screen line
int width2; // test width for wrapped screen line
int width2; // text width for wrapped screen line
oap->motion_type = MCHAR;
oap->inclusive = (curwin->w_curswant == MAXCOL);
@ -2656,6 +2656,7 @@ nv_screengo(oparg_T *oap, int dir, long dist)
if (curwin->w_cursor.col > 0 && curwin->w_p_wrap)
{
colnr_T virtcol;
int c;
/*
* Check for landing on a character that got split at the end of the
@ -2669,6 +2670,12 @@ nv_screengo(oparg_T *oap, int dir, long dist)
virtcol -= vim_strsize(get_showbreak_value(curwin));
#endif
c = (*mb_ptr2char)(ml_get_cursor());
if (dir == FORWARD && virtcol < curwin->w_curswant
&& (curwin->w_curswant <= (colnr_T)width1)
&& !vim_isprintc(c) && c > 255)
oneright();
if (virtcol > curwin->w_curswant
&& (curwin->w_curswant < (colnr_T)width1
? (curwin->w_curswant > (colnr_T)width1 / 2)

12
src/testdir/test_normal.vim
View File

@ -3423,4 +3423,16 @@ func Test_normal_count_after_operator()
bw!
endfunc
func Test_normal_gj_on_extra_wide_char()
new | 25vsp
let text='1 foooooooo ar e ins‍zwe1 foooooooo ins‍zwei' .
\ ' i drei vier fünf sechs sieben acht un zehn elf zwöfl' .
\ ' dreizehn v ierzehn fünfzehn'
put =text
call cursor(2,1)
norm! gj
call assert_equal([0,2,25,0], getpos('.'))
bw!
endfunc
" vim: shiftwidth=2 sts=2 expandtab

2
src/version.c
View File

@ -757,6 +757,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
3580,
/**/
3579,
/**/