patch 8.2.1509: vertical separator is cleared when dragging a popup window

Problem:    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 using a
            multi-byte character. (closes #6766)

diff --git a/src/screen.c b/src/screen.c
index 0d65b4bbdc3ffe698355c2fa172ef8d1703313ed..86ebd400b00c595d00dd05b8a2d4ab2be20297ed 100644 (file)
--- a/src/screen.c
+++ b/src/screen.c
@@ -464,7 +464,8 @@ screen_line(
     // First char of a popup window may go on top of the right half of a
     // double-wide character. Clear the left half to avoid it getting the popup
     // window background color.
-    if (coloff > 0 && ScreenLines[off_to] == 0)
+    if (coloff > 0 && ScreenLines[off_to] == 0
+                                            && ScreenLinesUC[off_to - 1] != 0)
     {
        ScreenLines[off_to - 1] = ' ';
        ScreenLinesUC[off_to - 1] = 0;

diff --git a/src/version.c b/src/version.c
index 26075ce29d583762e04c234e96cbfd657f072cd0..1cdd69a005228a1ce7cb271f68ec5acdf4eeda47 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 */
+/**/
+    1509,
 /**/
     1508,
 /**/