0
0
mirror of https://github.com/vim/vim.git synced 2025-10-02 05:04:20 -04:00

patch 8.1.1811: popup window color cannot be set to "Normal"

Problem:    Popup window color cannot be set to "Normal".
Solution:   Check for non-empty 'wincolor' instead of zero attribute.
            (closes #4772)
This commit is contained in:
Bram Moolenaar
2019-08-04 18:13:46 +02:00
parent b8350abef0
commit c363fe1599
5 changed files with 17 additions and 15 deletions

View File

@@ -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;