patch 8.2.1514: multibyte vertical separator is cleared when dragging popup

Problem:    Multibyte vertical separator is cleared when dragging a popup
            window using a multi-byte character for the border.
Solution:   Only clear the character before the window if it is double width.
            (closes #6766)

diff --git a/src/screen.c b/src/screen.c
index 86ebd400b00c595d00dd05b8a2d4ab2be20297ed..233d6a58529248fc5f215c574a01b6e915b09a8c 100644 (file)
--- a/src/screen.c
+++ b/src/screen.c
@@ -465,7 +465,8 @@ screen_line(
     // double-wide character. Clear the left half to avoid it getting the popup
     // window background color.
     if (coloff > 0 && ScreenLines[off_to] == 0
-                                            && ScreenLinesUC[off_to - 1] != 0)
+                  && ScreenLinesUC[off_to - 1] != 0
+                  && (*mb_char2cells)(ScreenLinesUC[off_to - 1]) > 1)
     {
        ScreenLines[off_to - 1] = ' ';
        ScreenLinesUC[off_to - 1] = 0;

diff --git a/src/version.c b/src/version.c
index b52d4a8c62a72851fa50c7f031bae1d713a7326d..02457eb5e9ef12c1bb3ded547b69e5723f833f66 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1514,
 /**/
     1513,
 /**/