diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-05-27 10:04:40 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-05-27 10:04:40 +0200 |
| commit | bf0ecb2cb63fb710198d6be742ae4f00fdd2f948 (patch) | |
| tree | f1b4d21d333025dbd169afa0fde8e3ea7f540ce7 | |
| parent | 7a8d0278bd6bd57e04f61183cb8e2969cf148e3f (diff) | |
| download | vim-git-bf0ecb2cb63fb710198d6be742ae4f00fdd2f948.tar.gz | |
patch 8.1.1408: PFL_HIDDEN conflicts with system header filev8.1.1408
Problem: PFL_HIDDEN conflicts with system header file.
Solution: Rename to POPF_HIDDEN.
| -rw-r--r-- | src/popupwin.c | 12 | ||||
| -rw-r--r-- | src/screen.c | 10 | ||||
| -rw-r--r-- | src/version.c | 2 | ||||
| -rw-r--r-- | src/vim.h | 4 |
4 files changed, 15 insertions, 13 deletions
diff --git a/src/popupwin.c b/src/popupwin.c index 95a91f939..922211944 100644 --- 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 *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); } } diff --git a/src/screen.c b/src/screen.c index 7354220cb..02cd172a9 100644 --- a/src/screen.c +++ b/src/screen.c @@ -999,9 +999,9 @@ update_popups(void) // Reset all the VALID_POPUP flags. for (wp = first_popupwin; wp != NULL; wp = wp->w_next) - wp->w_popup_flags &= ~PFL_REDRAWN; + wp->w_popup_flags &= ~POPF_REDRAWN; for (wp = curtab->tp_first_popupwin; wp != NULL; wp = wp->w_next) - wp->w_popup_flags &= ~PFL_REDRAWN; + wp->w_popup_flags &= ~POPF_REDRAWN; // TODO: don't redraw every popup every time. for (;;) @@ -1012,14 +1012,14 @@ update_popups(void) lowest_zindex = INT_MAX; lowest_wp = NULL; for (wp = first_popupwin; wp != NULL; wp = wp->w_next) - if ((wp->w_popup_flags & (PFL_REDRAWN|PFL_HIDDEN)) == 0 + if ((wp->w_popup_flags & (POPF_REDRAWN|POPF_HIDDEN)) == 0 && wp->w_zindex < lowest_zindex) { lowest_zindex = wp->w_zindex; lowest_wp = wp; } for (wp = curtab->tp_first_popupwin; wp != NULL; wp = wp->w_next) - if ((wp->w_popup_flags & (PFL_REDRAWN|PFL_HIDDEN)) == 0 + if ((wp->w_popup_flags & (POPF_REDRAWN|POPF_HIDDEN)) == 0 && wp->w_zindex < lowest_zindex) { lowest_zindex = wp->w_zindex; @@ -1029,7 +1029,7 @@ update_popups(void) if (lowest_wp == NULL) break; win_update(lowest_wp); - lowest_wp->w_popup_flags |= PFL_REDRAWN; + lowest_wp->w_popup_flags |= POPF_REDRAWN; } } #endif diff --git a/src/version.c b/src/version.c index a208d326d..5345a5fdc 100644 --- a/src/version.c +++ b/src/version.c @@ -768,6 +768,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1408, +/**/ 1407, /**/ 1406, @@ -614,8 +614,8 @@ extern int (*dyn_libintl_wputenv)(const wchar_t *envstring); #define VALID_TOPLINE 0x80 // w_topline is valid (for cursor position) // Values for w_popup_flags. -#define PFL_HIDDEN 1 // popup is not displayed -#define PFL_REDRAWN 2 // popup was just redrawn +#define POPF_HIDDEN 1 // popup is not displayed +#define POPF_REDRAWN 2 // popup was just redrawn /* * Terminal highlighting attribute bits. |