diff --git a/src/screen.c b/src/screen.c index 3798de88fd..5dfaed93c1 100644 --- a/src/screen.c +++ b/src/screen.c @@ -445,6 +445,21 @@ skip_for_popup(int row, int col) #endif ) return TRUE; + // Protect cells under the pum from background draws (vsep, status line). + // Excluded for wildmenu pum (MODE_CMDLINE): pum_row can be stale while + // the cmdline grows. +#ifdef FEAT_PROP_POPUP + if (screen_zindex < POPUPMENU_ZINDEX + && pum_visible() + && (State & MODE_CMDLINE) == 0 + && pum_under_menu(row, col, FALSE)) + return TRUE; +#else + if (pum_visible() + && (State & MODE_CMDLINE) == 0 + && pum_under_menu(row, col, FALSE)) + return TRUE; +#endif #ifdef FEAT_PROP_POPUP if (blocked_by_popup(row, col)) return TRUE; diff --git a/src/version.c b/src/version.c index 824a80de9c..08ebffbb59 100644 --- a/src/version.c +++ b/src/version.c @@ -729,6 +729,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 414, /**/ 413, /**/