summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 0d65b4bbd..86ebd400b 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 26075ce29..1cdd69a00 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,