From: Bram Moolenaar <Bram@vim.org>
Date: Sun, 23 Aug 2020 13:09:36 +0000 (+0200)
Subject: patch 8.2.1514: multibyte vertical separator is cleared when dragging popup
X-Git-Tag: v8.2.1514
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dc0cf1db3e8e0de349e4cc5b0a7ab6c8b7dc2ebb;p=vim

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 86ebd400b..233d6a585 100644
--- 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 b52d4a8c6..02457eb5e 100644
--- 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,
 /**/