mirror of
https://github.com/vim/vim.git
synced 2025-09-23 03:43:49 -04:00
updated for version 7.4.462
Problem: Setting the local value of 'backupcopy' empty gives an error. (Peter Mattern) Solution: When using an empty value set the flags to zero. (Hirohito Higashi)
This commit is contained in:
22
src/option.c
22
src/option.c
@@ -5742,15 +5742,21 @@ did_set_string_option(opt_idx, varp, new_value_alloced, oldval, errbuf,
|
|||||||
flags = &curbuf->b_bkc_flags;
|
flags = &curbuf->b_bkc_flags;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (opt_strings_flags(bkc, p_bkc_values, flags, TRUE) != OK)
|
if ((opt_flags & OPT_LOCAL) && *bkc == NUL)
|
||||||
errmsg = e_invarg;
|
/* make the local value empty: use the global value */
|
||||||
if ((((int)*flags & BKC_AUTO) != 0)
|
*flags = 0;
|
||||||
+ (((int)*flags & BKC_YES) != 0)
|
else
|
||||||
+ (((int)*flags & BKC_NO) != 0) != 1)
|
|
||||||
{
|
{
|
||||||
/* Must have exactly one of "auto", "yes" and "no". */
|
if (opt_strings_flags(bkc, p_bkc_values, flags, TRUE) != OK)
|
||||||
(void)opt_strings_flags(oldval, p_bkc_values, flags, TRUE);
|
errmsg = e_invarg;
|
||||||
errmsg = e_invarg;
|
if ((((int)*flags & BKC_AUTO) != 0)
|
||||||
|
+ (((int)*flags & BKC_YES) != 0)
|
||||||
|
+ (((int)*flags & BKC_NO) != 0) != 1)
|
||||||
|
{
|
||||||
|
/* Must have exactly one of "auto", "yes" and "no". */
|
||||||
|
(void)opt_strings_flags(oldval, p_bkc_values, flags, TRUE);
|
||||||
|
errmsg = e_invarg;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -741,6 +741,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
462,
|
||||||
/**/
|
/**/
|
||||||
461,
|
461,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user