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

updated for version 7.4.462

Browse Source 
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:
Bram Moolenaar
2014-09-29 17:15:18 +02:00
parent 7ddc642a0c
commit 84d17a6f9e
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/option.c
View File

@@ -5742,6 +5742,11 @@ did_set_string_option(opt_idx, varp, new_value_alloced, oldval, errbuf,
flags = &curbuf->b_bkc_flags; flags = &curbuf->b_bkc_flags;
} }
if ((opt_flags & OPT_LOCAL) && *bkc == NUL)
/* make the local value empty: use the global value */
*flags = 0;
else
{
if (opt_strings_flags(bkc, p_bkc_values, flags, TRUE) != OK) if (opt_strings_flags(bkc, p_bkc_values, flags, TRUE) != OK)
errmsg = e_invarg; errmsg = e_invarg;
if ((((int)*flags & BKC_AUTO) != 0) if ((((int)*flags & BKC_AUTO) != 0)
@@ -5753,6 +5758,7 @@ did_set_string_option(opt_idx, varp, new_value_alloced, oldval, errbuf,
errmsg = e_invarg; errmsg = e_invarg;
} }
} }
}
/* 'backupext' and 'patchmode' */ /* 'backupext' and 'patchmode' */
else if (varp == &p_bex || varp == &p_pm) else if (varp == &p_bex || varp == &p_pm)

2
src/version.c
View File

@@ -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,
/**/ /**/