aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-28 04:24:06 -04:00
Code Activity

patch 8.1.1408: PFL_HIDDEN conflicts with system header file

Browse Source 
Problem:    PFL_HIDDEN conflicts with system header file.
Solution:   Rename to POPF_HIDDEN.
This commit is contained in:
Bram Moolenaar
2019-05-27 10:04:40 +02:00
parent 7a8d0278bd
commit bf0ecb2cb6
4 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/popupwin.c
View File

@@ -300,10 +300,10 @@ popup_any_visible(void)
win_T *wp;
for (wp = first_popupwin; wp != NULL; wp = wp->w_next)
if ((wp->w_popup_flags & PFL_HIDDEN) == 0)
if ((wp->w_popup_flags & POPF_HIDDEN) == 0)
return TRUE;
for (wp = curtab->tp_first_popupwin; wp != NULL; wp = wp->w_next)
if ((wp->w_popup_flags & PFL_HIDDEN) == 0)
if ((wp->w_popup_flags & POPF_HIDDEN) == 0)
return TRUE;
return FALSE;
}
@@ -328,9 +328,9 @@ f_popup_hide(typval_T *argvars, typval_T *rettv UNUSED)
int id = (int)tv_get_number(argvars);
win_T *wp = find_popup_win(id);
if (wp != NULL && (wp->w_popup_flags & PFL_HIDDEN) == 0)
if (wp != NULL && (wp->w_popup_flags & POPF_HIDDEN) == 0)
{
wp->w_popup_flags |= PFL_HIDDEN;
wp->w_popup_flags |= POPF_HIDDEN;
redraw_all_later(NOT_VALID);
}
}
@@ -344,9 +344,9 @@ f_popup_show(typval_T *argvars, typval_T *rettv UNUSED)
int id = (int)tv_get_number(argvars);
win_T *wp = find_popup_win(id);
if (wp != NULL && (wp->w_popup_flags & PFL_HIDDEN) != 0)
if (wp != NULL && (wp->w_popup_flags & POPF_HIDDEN) != 0)
{
wp->w_popup_flags &= ~PFL_HIDDEN;
wp->w_popup_flags &= ~POPF_HIDDEN;
redraw_all_later(NOT_VALID);
}
}