diff options
Diffstat (limited to 'src/option.c')
| -rw-r--r-- | src/option.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/option.c b/src/option.c index e6c05ec10c..f78d48d2a2 100644 --- a/src/option.c +++ b/src/option.c @@ -4438,7 +4438,7 @@ do_set( afterchar = arg[len]; /* skip white space, allow ":set ai ?" */ - while (vim_iswhite(arg[len])) + while (VIM_ISWHITE(arg[len])) ++len; adding = FALSE; @@ -4562,7 +4562,7 @@ do_set( } } if (vim_strchr((char_u *)"?!&<", nextchar) != NULL - && arg[1] != NUL && !vim_iswhite(arg[1])) + && arg[1] != NUL && !VIM_ISWHITE(arg[1])) { errmsg = e_trailing; goto skip; @@ -4620,7 +4620,7 @@ do_set( (void)show_one_termcode(key_name, p, TRUE); } if (nextchar != '?' - && nextchar != NUL && !vim_iswhite(afterchar)) + && nextchar != NUL && !VIM_ISWHITE(afterchar)) errmsg = e_trailing; } else @@ -4660,7 +4660,7 @@ do_set( * ":set invopt": invert * ":set opt" or ":set noopt": set or reset */ - if (nextchar != NUL && !vim_iswhite(afterchar)) + if (nextchar != NUL && !VIM_ISWHITE(afterchar)) { errmsg = e_trailing; goto skip; @@ -4714,7 +4714,8 @@ do_set( || (long *)varp == &p_wcm) && (*arg == '<' || *arg == '^' - || (*arg != NUL && (!arg[1] || vim_iswhite(arg[1])) + || (*arg != NUL + && (!arg[1] || VIM_ISWHITE(arg[1])) && !VIM_ISDIGIT(*arg)))) { value = string_to_key(arg); @@ -4730,7 +4731,7 @@ do_set( * hex numbers. */ vim_str2nr(arg, NULL, &i, STR2NR_ALL, &value, NULL, 0); - if (arg[i] != NUL && !vim_iswhite(arg[i])) + if (arg[i] != NUL && !VIM_ISWHITE(arg[i])) { errmsg = e_invarg; goto skip; @@ -4922,7 +4923,7 @@ do_set( * do remove it for "\\\\machine\\path". * The reverse is found in ExpandOldSetting(). */ - while (*arg && !vim_iswhite(*arg)) + while (*arg && !VIM_ISWHITE(*arg)) { if (*arg == '\\' && arg[1] != NUL #ifdef BACKSLASH_IN_FILENAME @@ -5162,7 +5163,7 @@ do_set( else { ++arg; /* jump to after the '=' or ':' */ - for (p = arg; *p && !vim_iswhite(*p); ++p) + for (p = arg; *p && !VIM_ISWHITE(*p); ++p) if (*p == '\\' && p[1] != NUL) ++p; nextchar = *p; @@ -5190,7 +5191,7 @@ skip: */ for (i = 0; i < 2 ; ++i) { - while (*arg != NUL && !vim_iswhite(*arg)) + while (*arg != NUL && !VIM_ISWHITE(*arg)) if (*arg++ == '\\' && *arg != NUL) ++arg; arg = skipwhite(arg); |