aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -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; win_T *wp;
for (wp = first_popupwin; wp != NULL; wp = wp->w_next) 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; return TRUE;
for (wp = curtab->tp_first_popupwin; wp != NULL; wp = wp->w_next) 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 TRUE;
return FALSE; return FALSE;
} }
@@ -328,9 +328,9 @@ f_popup_hide(typval_T *argvars, typval_T *rettv UNUSED)
int id = (int)tv_get_number(argvars); int id = (int)tv_get_number(argvars);
win_T *wp = find_popup_win(id); 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); 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); int id = (int)tv_get_number(argvars);
win_T *wp = find_popup_win(id); 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); redraw_all_later(NOT_VALID);
} }
} }

10
src/screen.c
View File

@@ -999,9 +999,9 @@ update_popups(void)
// Reset all the VALID_POPUP flags. // Reset all the VALID_POPUP flags.
for (wp = first_popupwin; wp != NULL; wp = wp->w_next) 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) 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. // TODO: don't redraw every popup every time.
for (;;) for (;;)
@@ -1012,14 +1012,14 @@ update_popups(void)
lowest_zindex = INT_MAX; lowest_zindex = INT_MAX;
lowest_wp = NULL; lowest_wp = NULL;
for (wp = first_popupwin; wp != NULL; wp = wp->w_next) 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) && wp->w_zindex < lowest_zindex)
{ {
lowest_zindex = wp->w_zindex; lowest_zindex = wp->w_zindex;
lowest_wp = wp; lowest_wp = wp;
} }
for (wp = curtab->tp_first_popupwin; wp != NULL; wp = wp->w_next) 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) && wp->w_zindex < lowest_zindex)
{ {
lowest_zindex = wp->w_zindex; lowest_zindex = wp->w_zindex;
@@ -1029,7 +1029,7 @@ update_popups(void)
if (lowest_wp == NULL) if (lowest_wp == NULL)
break; break;
win_update(lowest_wp); win_update(lowest_wp);
lowest_wp->w_popup_flags |= PFL_REDRAWN; lowest_wp->w_popup_flags |= POPF_REDRAWN;
} }
} }
#endif #endif

2
src/version.c
View File

@@ -767,6 +767,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1408,
/**/ /**/
1407, 1407,
/**/ /**/

4
src/vim.h
View File

@@ -614,8 +614,8 @@ extern int (*dyn_libintl_wputenv)(const wchar_t *envstring);
#define VALID_TOPLINE 0x80 // w_topline is valid (for cursor position) #define VALID_TOPLINE 0x80 // w_topline is valid (for cursor position)
// Values for w_popup_flags. // Values for w_popup_flags.
#define PFL_HIDDEN 1 // popup is not displayed #define POPF_HIDDEN 1 // popup is not displayed
#define PFL_REDRAWN 2 // popup was just redrawn #define POPF_REDRAWN 2 // popup was just redrawn
/* /*
* Terminal highlighting attribute bits. * Terminal highlighting attribute bits.