Mercurial > vim
diff src/popupwin.c @ 16813:4cfad94161f4 v8.1.1408
patch 8.1.1408: PFL_HIDDEN conflicts with system header file
commit https://github.com/vim/vim/commit/bf0ecb2cb63fb710198d6be742ae4f00fdd2f948
Author: Bram Moolenaar <Bram@vim.org>
Date: Mon May 27 10:04:40 2019 +0200
patch 8.1.1408: PFL_HIDDEN conflicts with system header file
Problem: PFL_HIDDEN conflicts with system header file.
Solution: Rename to POPF_HIDDEN.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Mon, 27 May 2019 10:15:05 +0200 |
| parents | 0457d49eb2d9 |
| children | 069ee8dc8c8d |
line wrap: on
line diff
--- a/src/popupwin.c +++ b/src/popupwin.c @@ -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 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 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); } }