commit 3dabd718f4b2d8e09de9e2ec73832620b91c2f79
author Bram Moolenaar <Bram@vim.org> Mon Jul 08 23:30:22 2019 +0200
committer Bram Moolenaar <Bram@vim.org> Mon Jul 08 23:30:22 2019 +0200
tree d8dc80b5d6b1a718537d688fcf906418289f4212
parent 8a7383b6d28be02413cf115d4b8ed1b44d60dd9f

patch 8.1.1655: popup window border drawn wrong with multi-byte char

Problem:    Popup window border drawn wrong with multi-byte char. (Marcin
            Szamotulski)
Solution:   Correct check in mb_fix_col(). (closes #4635)

src/mbyte.c

diff --git a/src/mbyte.c b/src/mbyte.c
index 94adddf..2b76400 100644
--- a/src/mbyte.c
+++ b/src/mbyte.c
@@ -4266,14 +4266,18 @@
     int
 mb_fix_col(int col, int row)
 {
+    int off;
+
     col = check_col(col);
     row = check_row(row);
+    off = LineOffset[row] + col;
     if (has_mbyte && ScreenLines != NULL && col > 0
 	    && ((enc_dbcs
-		    && ScreenLines[LineOffset[row] + col] != NUL
+		    && ScreenLines[off] != NUL
 		    && dbcs_screen_head_off(ScreenLines + LineOffset[row],
-					 ScreenLines + LineOffset[row] + col))
-		|| (enc_utf8 && ScreenLines[LineOffset[row] + col] == 0)))
+					 ScreenLines + off))
+		|| (enc_utf8 && ScreenLines[off] == 0
+						  && ScreenLinesUC[off] == 0)))
 	return col - 1;
     return col;
 }