patch 8.1.1408: PFL_HIDDEN conflicts with system header file

Problem:    PFL_HIDDEN conflicts with system header file.
Solution:   Rename to POPF_HIDDEN.

diff --git a/src/popupwin.c b/src/popupwin.c
index 95a91f93916578b06fa44f04887ccda370a8c7df..9222119445b8f4dc248617d3554024e6565eeecf 100644 (file)
--- 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 7354220cbb40986de7ffc560353d4ff89c0ab2a2..02cd172a90077860b251a8f4e8f6cd7de24b0f99 100644 (file)
--- 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 a208d326d0959d6c7940468d707d8ea767d50e54..5345a5fdc38174d07f3fa8f9060949dd7a86d3b3 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -767,6 +767,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1408,
 /**/
     1407,
 /**/

diff --git a/src/vim.h b/src/vim.h
index a52ba5e64c7a31bedbd273fdee1d4660ca5034b3..42a415a6a0c0732ea6648fed4afeb7aa8d2b8439 100644 (file)
--- a/src/vim.h
+++ b/src/vim.h
@@ -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.