summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-08-23 15:09:36 +0200
committerBram Moolenaar <Bram@vim.org>2020-08-23 15:09:36 +0200
commitdc0cf1db3e8e0de349e4cc5b0a7ab6c8b7dc2ebb (patch)
tree63c9a20435c0993d4f5915513862e5b2ab41d621
parent0981c8729e09551f2e8e6c159bc29f2c1d04019c (diff)
downloadvim-git-dc0cf1db3e8e0de349e4cc5b0a7ab6c8b7dc2ebb.tar.gz
patch 8.2.1514: multibyte vertical separator is cleared when dragging popupv8.2.1514
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)
-rw-r--r--src/screen.c3
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 1 deletions
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
@@ -755,6 +755,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1514,
+/**/
1513,
/**/
1512,