patch 8.1.1555: NOT_IN_POPUP_WINDOW is confusing

Problem:    NOT_IN_POPUP_WINDOW is confusing. (Andy Massimino)
Solution:   Rename to ERROR_IF_POPUP_WINDOW().

diff --git a/src/ex_cmds2.c b/src/ex_cmds2.c
index 3c73030e6b7b07f8d925d59fecef3d6d44ab856c..af7aa4b8ea6fb7b8850d0cbb1def7c3c62e66c93 100644 (file)
--- a/src/ex_cmds2.c
+++ b/src/ex_cmds2.c
@@ -1864,7 +1864,7 @@ do_argfile(exarg_T *eap, int argn)
     char_u     *p;
     int                old_arg_idx = curwin->w_arg_idx;
 
-    if (NOT_IN_POPUP_WINDOW)
+    if (ERROR_IF_POPUP_WINDOW)
        return;
     if (argn < 0 || argn >= ARGCOUNT)
     {

diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 438cb355aa02e6392515c71feaf050315828b563..d2a6681c6db975f41c62d6eb03d3ba3225d34bd9 100644 (file)
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -5454,7 +5454,7 @@ ex_doautocmd(exarg_T *eap)
     static void
 ex_bunload(exarg_T *eap)
 {
-    if (NOT_IN_POPUP_WINDOW)
+    if (ERROR_IF_POPUP_WINDOW)
        return;
     eap->errmsg = do_bufdel(
            eap->cmdidx == CMD_bdelete ? DOBUF_DEL
@@ -5470,7 +5470,7 @@ ex_bunload(exarg_T *eap)
     static void
 ex_buffer(exarg_T *eap)
 {
-    if (NOT_IN_POPUP_WINDOW)
+    if (ERROR_IF_POPUP_WINDOW)
        return;
     if (*eap->arg)
        eap->errmsg = e_trailing;
@@ -6774,7 +6774,7 @@ ex_splitview(exarg_T *eap)
                       || eap->cmdidx == CMD_tabfind
                       || eap->cmdidx == CMD_tabnew;
 
-    if (NOT_IN_POPUP_WINDOW)
+    if (ERROR_IF_POPUP_WINDOW)
        return;
 
 #ifdef FEAT_GUI
@@ -6904,7 +6904,7 @@ ex_tabnext(exarg_T *eap)
 {
     int tab_number;
 
-    if (NOT_IN_POPUP_WINDOW)
+    if (ERROR_IF_POPUP_WINDOW)
        return;
     switch (eap->cmdidx)
     {
@@ -7157,7 +7157,7 @@ do_exedit(
     int                need_hide;
     int                exmode_was = exmode_active;
 
-    if (NOT_IN_POPUP_WINDOW)
+    if (ERROR_IF_POPUP_WINDOW)
        return;
     /*
      * ":vi" command ends Ex mode.

diff --git a/src/macros.h b/src/macros.h
index 0f5ab7739df5c3c8225e139632cf62ed5d37611a..d685deafb9ef2a659c9c36d1e2f7af13572c7d4a 100644 (file)
--- a/src/macros.h
+++ b/src/macros.h
@@ -340,8 +340,9 @@
 /* Wether a command index indicates a user command. */
 #define IS_USER_CMDIDX(idx) ((int)(idx) < 0)
 
+// Give an error in curwin is a popup window and evaluate to TRUE.
 #ifdef FEAT_TEXT_PROP
-# define NOT_IN_POPUP_WINDOW not_in_popup_window()
+# define ERROR_IF_POPUP_WINDOW error_if_popup_window()
 #else
-# define NOT_IN_POPUP_WINDOW 0
+# define ERROR_IF_POPUP_WINDOW 0
 #endif

diff --git a/src/popupwin.c b/src/popupwin.c
index 99ef2908cd4c4987fe01aea4f1e2cbf566dcae63..ea1a1e1e711a28fc56f04c7b0afda67abda4e527 100644 (file)
--- a/src/popupwin.c
+++ b/src/popupwin.c
@@ -1336,7 +1336,7 @@ f_popup_getoptions(typval_T *argvars, typval_T *rettv)
 }
 
     int
-not_in_popup_window()
+error_if_popup_window()
 {
     if (bt_popup(curwin->w_buffer))
     {

diff --git a/src/proto/popupwin.pro b/src/proto/popupwin.pro
index e026506c5ab7c6fbe7229483cdacf9e5160a5ea3..1eb2c102a5065f2c2988e948d7d62f4c0aa241c7 100644 (file)
--- a/src/proto/popupwin.pro
+++ b/src/proto/popupwin.pro
@@ -21,7 +21,7 @@ void close_all_popups(void);
 void f_popup_move(typval_T *argvars, typval_T *rettv);
 void f_popup_getpos(typval_T *argvars, typval_T *rettv);
 void f_popup_getoptions(typval_T *argvars, typval_T *rettv);
-int not_in_popup_window(void);
+int error_if_popup_window(void);
 void popup_reset_handled(void);
 win_T *find_next_popup(int lowest);
 int popup_do_filter(int c);

diff --git a/src/version.c b/src/version.c
index fcdf562d47a9fb142a5897fbff1f8db12cd31850..bf1a1f204d75f985945b560b00e32a1d9dd4bbd5 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -777,6 +777,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1555,
 /**/
     1554,
 /**/

diff --git a/src/window.c b/src/window.c
index 436912934eee2a0ce0be5f41b5bf60a97a80dec1..ee616ee968cd80a52f9683a9de51ede36f4c6b9b 100644 (file)
--- a/src/window.c
+++ b/src/window.c
@@ -87,7 +87,7 @@ do_window(
 #endif
     char_u     cbuf[40];
 
-    if (NOT_IN_POPUP_WINDOW)
+    if (ERROR_IF_POPUP_WINDOW)
        return;
 
 #ifdef FEAT_CMDWIN
@@ -735,7 +735,7 @@ cmd_with_count(
     int
 win_split(int size, int flags)
 {
-    if (NOT_IN_POPUP_WINDOW)
+    if (ERROR_IF_POPUP_WINDOW)
        return FAIL;
 
     /* When the ":tab" modifier was used open a new tab page instead. */
@@ -1523,7 +1523,7 @@ win_exchange(long Prenum)
     win_T      *wp2;
     int                temp;
 
-    if (NOT_IN_POPUP_WINDOW)
+    if (ERROR_IF_POPUP_WINDOW)
        return;
     if (ONE_WINDOW)        // just one window
     {
@@ -2379,7 +2379,7 @@ win_close(win_T *win, int free_buf)
     tabpage_T   *prev_curtab = curtab;
     frame_T    *win_frame = win->w_frame->fr_parent;
 
-    if (NOT_IN_POPUP_WINDOW)
+    if (ERROR_IF_POPUP_WINDOW)
        return FAIL;
 
     if (last_window())
@@ -4240,7 +4240,7 @@ win_goto(win_T *wp)
     win_T      *owp = curwin;
 #endif
 
-    if (NOT_IN_POPUP_WINDOW)
+    if (ERROR_IF_POPUP_WINDOW)
        return;
     if (text_locked())
     {