patch 8.2.3580: gj does not move properly with a wide character
Problem: gj does not move properly with a wide character.
Solution: Move one to the right. (Christian Brabandt, closes #8702)
diff --git a/src/normal.c b/src/normal.c
index e6b7a8a..ba3b53b 100644
--- a/src/normal.c
+++ b/src/normal.c
@@ -2530,7 +2530,7 @@
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 @@
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 @@
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)