summaryrefslogtreecommitdiff
path: root/src/screen.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-08-04 18:13:46 +0200
committerBram Moolenaar <Bram@vim.org>2019-08-04 18:13:46 +0200
commitc363fe1599655232e8bd6e279fbf70d4c1b7baf6 (patch)
tree89f8de51fa679f8e0fb1660edabd848619d8698b /src/screen.c
parentb8350abef0abbdca99bf08e821a8ba0ade37abed (diff)
downloadvim-git-c363fe1599655232e8bd6e279fbf70d4c1b7baf6.tar.gz
patch 8.1.1811: popup window color cannot be set to "Normal"v8.1.1811
Problem: Popup window color cannot be set to "Normal". Solution: Check for non-empty 'wincolor' instead of zero attribute. (closes #4772)
Diffstat (limited to 'src/screen.c')
-rw-r--r--src/screen.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/screen.c b/src/screen.c
index 04d0e2ffc..55437e147 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -995,7 +995,7 @@ get_wcr_attr(win_T *wp)
if (*wp->w_p_wcr != NUL)
wcr_attr = syn_name2attr(wp->w_p_wcr);
#ifdef FEAT_TEXT_PROP
- if (WIN_IS_POPUP(wp) && wcr_attr == 0)
+ else if (WIN_IS_POPUP(wp))
wcr_attr = HL_ATTR(HLF_PNI);
#endif
return wcr_attr;
@@ -9210,8 +9210,8 @@ win_ins_lines(
/*
* If there is a next window or a status line, we first try to delete the
* lines at the bottom to avoid messing what is after the window.
- * If this fails and there are following windows, don't do anything to avoid
- * messing up those windows, better just redraw.
+ * If this fails and there are following windows, don't do anything to
+ * avoid messing up those windows, better just redraw.
*/
did_delete = FALSE;
if (wp->w_next != NULL || wp->w_status_height)
@@ -9241,7 +9241,7 @@ win_ins_lines(
if (screen_ins_lines(0, W_WINROW(wp) + row, line_count, (int)Rows, 0, NULL)
== FAIL)
{
- /* deletion will have messed up other windows */
+ // deletion will have messed up other windows
if (did_delete)
{
wp->w_redr_status = TRUE;