summaryrefslogtreecommitdiffstats
path: root/src/evalfunc.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-11-30 22:48:27 +0100
committerBram Moolenaar <Bram@vim.org>2019-11-30 22:48:27 +0100
commit05ad5ff0ab34ed9a5296dedd420ca81698b8ce22 (patch)
tree7354d352e37ab28988ce26e4f88efd9a9b9f71ec /src/evalfunc.c
parent0c5c3faef2d54151a8c144539e3e5a3350fb18c7 (diff)
patch 8.1.2371: FEAT_TEXT_PROP is a confusing namev8.1.2371
Problem: FEAT_TEXT_PROP is a confusing name. Solution: Use FEAT_PROP_POPUP. (Naruhiko Nishino, closes #5291)
Diffstat (limited to 'src/evalfunc.c')
-rw-r--r--src/evalfunc.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/evalfunc.c b/src/evalfunc.c
index a071ad8b65..f6ea57c630 100644
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -584,7 +584,7 @@ static funcentry_T global_functions[] =
#ifdef FEAT_PERL
{"perleval", 1, 1, FEARG_1, f_perleval},
#endif
-#ifdef FEAT_TEXT_PROP
+#ifdef FEAT_PROP_POPUP
{"popup_atcursor", 2, 2, FEARG_1, f_popup_atcursor},
{"popup_beval", 2, 2, FEARG_1, f_popup_beval},
{"popup_clear", 0, 0, 0, f_popup_clear},
@@ -616,7 +616,7 @@ static funcentry_T global_functions[] =
{"prompt_setinterrupt", 2, 2, FEARG_1, f_prompt_setinterrupt},
{"prompt_setprompt", 2, 2, FEARG_1, f_prompt_setprompt},
#endif
-#ifdef FEAT_TEXT_PROP
+#ifdef FEAT_PROP_POPUP
{"prop_add", 3, 3, FEARG_1, f_prop_add},
{"prop_clear", 1, 3, FEARG_1, f_prop_clear},
{"prop_list", 1, 2, FEARG_1, f_prop_list},
@@ -3532,6 +3532,9 @@ f_has(typval_T *argvars, typval_T *rettv)
"pythonx",
# endif
#endif
+#ifdef FEAT_PROP_POPUP
+ "popupwin",
+#endif
#ifdef FEAT_POSTSCRIPT
"postscript",
#endif
@@ -3608,7 +3611,7 @@ f_has(typval_T *argvars, typval_T *rettv)
#ifdef FEAT_TEXTOBJ
"textobjects",
#endif
-#ifdef FEAT_TEXT_PROP
+#ifdef FEAT_PROP_POPUP
"textprop",
#endif
#ifdef HAVE_TGETENT