0
0
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00

patch 8.1.1086: too many curly braces

Problem:    Too many curly braces.
Solution:   Remove curly braces where they are not needed. (Hirohito Higashi,
            closes #3982)
This commit is contained in:
Bram Moolenaar
2019-03-30 18:47:01 +01:00
parent bd9bf266fc
commit abab0b0fdd
42 changed files with 26 additions and 189 deletions

View File

@@ -6058,9 +6058,7 @@ did_set_string_option(
|| sandbox != 0
#endif
) && (options[opt_idx].flags & P_SECURE))
{
errmsg = e_secure;
}
// Check for a "normal" directory or file name in some options. Disallow a
// path separator (slash and/or backslash), wildcards and characters that
@@ -6070,9 +6068,7 @@ did_set_string_option(
? "/\\*?[|;&<>\r\n" : "/\\*?[<>\r\n")) != NULL)
|| ((options[opt_idx].flags & P_NDNAME)
&& vim_strpbrk(*varp, (char_u *)"*?[|;&<>\r\n") != NULL))
{
errmsg = e_invarg;
}
/* 'term' */
else if (varp == &T_NAME)
@@ -6722,9 +6718,7 @@ did_set_string_option(
break;
}
if (*s == 'n') /* name is always last one */
{
break;
}
else if (*s == 'r') /* skip until next ',' */
{
while (*++s && *s != ',')
@@ -8318,9 +8312,7 @@ set_bool_option(
/* 'compatible' */
if ((int *)varp == &p_cp)
{
compatible_set();
}
#ifdef FEAT_LANGMAP
if ((int *)varp == &p_lrm)
@@ -8547,9 +8539,11 @@ set_bool_option(
/* when 'textauto' is set or reset also change 'fileformats' */
else if ((int *)varp == &p_ta)
{
set_string_option_direct((char_u *)"ffs", -1,
p_ta ? (char_u *)DFLT_FFS_VIM : (char_u *)"",
OPT_FREE | opt_flags, 0);
}
/*
* When 'lisp' option changes include/exclude '-' in