patch 8.0.0250: virtcol() does not work well for multi-byte charactersv8.0.0250

Problem:    When virtcol() gets a column that is not the first byte of a
            multi-byte character the result is unpredictable. (Christian
            Ludwig)
Solution:   Correct the column to the first byte of a multi-byte character.
            Change the utf-8 test to new style.

1 files changed, 7 insertions, 0 deletions

diff --git a/src/charset.c b/src/charset.c
index c047afec7f..e766fa5f6b 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -1296,7 +1296,14 @@ getvcol(
     if (pos->col == MAXCOL)
 	posptr = NULL;  /* continue until the NUL */
     else
+    {
 	posptr = ptr + pos->col;
+#ifdef FEAT_MBYTE
+	if (has_mbyte)
+	    /* always start on the first byte */
+	    posptr -= (*mb_head_off)(line, posptr);
+#endif
+    }
 
     /*
      * This function is used very often, do some speed optimizations.