summaryrefslogtreecommitdiff
path: root/src/menu.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-03-12 20:10:05 +0100
committerBram Moolenaar <Bram@vim.org>2017-03-12 20:10:05 +0100
commit1c46544412382db8b3203d6c78e550df885540bd (patch)
treed4dc51020d3ebdbee4548b0d5628221f921af2f3 /src/menu.c
parent91acfffc1e6c0d8c2abfb186a0e79a5bf19c3f3f (diff)
downloadvim-git-1c46544412382db8b3203d6c78e550df885540bd.tar.gz
patch 8.0.0452: some macros are in lower casev8.0.0452
Problem: Some macros are in lower case. Solution: Make a few more macros upper case.
Diffstat (limited to 'src/menu.c')
-rw-r--r--src/menu.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/menu.c b/src/menu.c
index b1b4ec7d4..07cf57ec4 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -167,9 +167,9 @@ ex_menu(
for (p = arg; *p; ++p)
if (!VIM_ISDIGIT(*p) && *p != '.')
break;
- if (vim_iswhite(*p))
+ if (VIM_ISWHITE(*p))
{
- for (i = 0; i < MENUDEPTH && !vim_iswhite(*arg); ++i)
+ for (i = 0; i < MENUDEPTH && !VIM_ISWHITE(*arg); ++i)
{
pri_tab[i] = getdigits(&arg);
if (pri_tab[i] == 0)
@@ -193,12 +193,12 @@ ex_menu(
/*
* Check for "disable" or "enable" argument.
*/
- if (STRNCMP(arg, "enable", 6) == 0 && vim_iswhite(arg[6]))
+ if (STRNCMP(arg, "enable", 6) == 0 && VIM_ISWHITE(arg[6]))
{
enable = TRUE;
arg = skipwhite(arg + 6);
}
- else if (STRNCMP(arg, "disable", 7) == 0 && vim_iswhite(arg[7]))
+ else if (STRNCMP(arg, "disable", 7) == 0 && VIM_ISWHITE(arg[7]))
{
enable = FALSE;
arg = skipwhite(arg + 7);
@@ -1219,24 +1219,24 @@ set_context_in_menu_cmd(
if (!VIM_ISDIGIT(*p) && *p != '.')
break;
- if (!vim_iswhite(*p))
+ if (!VIM_ISWHITE(*p))
{
if (STRNCMP(arg, "enable", 6) == 0
- && (arg[6] == NUL || vim_iswhite(arg[6])))
+ && (arg[6] == NUL || VIM_ISWHITE(arg[6])))
p = arg + 6;
else if (STRNCMP(arg, "disable", 7) == 0
- && (arg[7] == NUL || vim_iswhite(arg[7])))
+ && (arg[7] == NUL || VIM_ISWHITE(arg[7])))
p = arg + 7;
else
p = arg;
}
- while (*p != NUL && vim_iswhite(*p))
+ while (*p != NUL && VIM_ISWHITE(*p))
++p;
arg = after_dot = p;
- for (; *p && !vim_iswhite(*p); ++p)
+ for (; *p && !VIM_ISWHITE(*p); ++p)
{
if ((*p == '\\' || *p == Ctrl_V) && p[1] != NUL)
p++;
@@ -1247,7 +1247,7 @@ set_context_in_menu_cmd(
/* ":tearoff" and ":popup" only use menus, not entries */
expand_menus = !((*cmd == 't' && cmd[1] == 'e') || *cmd == 'p');
expand_emenu = (*cmd == 'e');
- if (expand_menus && vim_iswhite(*p))
+ if (expand_menus && VIM_ISWHITE(*p))
return NULL; /* TODO: check for next command? */
if (*p == NUL) /* Complete the menu name */
{
@@ -2432,7 +2432,7 @@ ex_menutranslate(exarg_T *eap UNUSED)
static char_u *
menu_skip_part(char_u *p)
{
- while (*p != NUL && *p != '.' && !vim_iswhite(*p))
+ while (*p != NUL && *p != '.' && !VIM_ISWHITE(*p))
{
if ((*p == '\\' || *p == Ctrl_V) && p[1] != NUL)
++p;
@@ -2500,7 +2500,7 @@ menu_translate_tab_and_shift(char_u *arg_start)
{
char_u *arg = arg_start;
- while (*arg && !vim_iswhite(*arg))
+ while (*arg && !VIM_ISWHITE(*arg))
{
if ((*arg == '\\' || *arg == Ctrl_V) && arg[1] != NUL)
arg++;