patch 8.2.4913: popup_hide() does not always have effect
Problem: Popup_hide() does not always have effect.
Solution: Add the POPF_HIDDEN_FORCE flag. (closes #10376)
diff --git a/src/popupwin.c b/src/popupwin.c
index 27e9fe1..2306dac 100644
--- a/src/popupwin.c
+++ b/src/popupwin.c
@@ -978,7 +978,7 @@
nr = dict_get_bool(dict, (char_u *)"hidden", FALSE);
if (nr > 0)
- wp->w_popup_flags |= POPF_HIDDEN;
+ wp->w_popup_flags |= POPF_HIDDEN | POPF_HIDDEN_FORCE;
// when "firstline" and "cursorline" are both set and the cursor would be
// above or below the displayed lines, move the cursor to "firstline".
@@ -2644,7 +2644,10 @@
id = (int)tv_get_number(argvars);
wp = find_popup_win(id);
if (wp != NULL)
+ {
popup_hide(wp);
+ wp->w_popup_flags |= POPF_HIDDEN_FORCE;
+ }
}
void
@@ -2674,6 +2677,7 @@
wp = find_popup_win(id);
if (wp != NULL)
{
+ wp->w_popup_flags &= ~POPF_HIDDEN_FORCE;
popup_show(wp);
#ifdef FEAT_QUICKFIX
if (wp->w_popup_flags & POPF_INFO)
@@ -3606,8 +3610,9 @@
textprop_T prop;
linenr_T lnum;
- if (find_visible_prop(wp->w_popup_prop_win,
- wp->w_popup_prop_type, wp->w_popup_prop_id,
+ if ((wp->w_popup_flags & POPF_HIDDEN_FORCE) == 0
+ && find_visible_prop(wp->w_popup_prop_win,
+ wp->w_popup_prop_type, wp->w_popup_prop_id,
&prop, &lnum) == OK)
{
wp->w_popup_flags &= ~POPF_HIDDEN;