summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-08-22 17:21:14 +0200
committerBram Moolenaar <Bram@vim.org>2020-08-22 17:21:14 +0200
commit9943b3d97955ece99c747c959e0a7d493bb762bb (patch)
treec33dd3b16c0d20cb1eae23381439ceeb1af532bf
parentc63b72b6dc1347530ce906b462bb568994552c8b (diff)
patch 8.2.1509: vertical separator is cleared when dragging a popup windowv8.2.1509
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)
-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 0d65b4bbdc..86ebd400b0 100644
--- 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 26075ce29d..1cdd69a005 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 */
/**/
+ 1509,
+/**/
1508,
/**/
1507,