IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1856 from Hinidu/vim-7.4.462

Browse Source 
vim-patch:7.4.462
This commit is contained in:
Justin M. Keyes 2015-01-20 17:48:34 -05:00
commit 57207ea60e
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/nvim/option.c
View File

@ -3794,6 +3794,10 @@ did_set_string_option (
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;
} }
@ -3801,11 +3805,12 @@ did_set_string_option (
if (((*flags & BKC_AUTO) != 0) if (((*flags & BKC_AUTO) != 0)
+ ((*flags & BKC_YES) != 0) + ((*flags & BKC_YES) != 0)
+ ((*flags & BKC_NO) != 0) != 1) { + ((*flags & BKC_NO) != 0) != 1) {
/* Must have exactly one of "auto", "yes" and "no". */ // Must have exactly one of "auto", "yes" and "no".
(void)opt_strings_flags(oldval, p_bkc_values, flags, TRUE); (void)opt_strings_flags(oldval, p_bkc_values, flags, TRUE);
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) {
if (STRCMP(*p_bex == '.' ? p_bex + 1 : p_bex, if (STRCMP(*p_bex == '.' ? p_bex + 1 : p_bex,

2
src/nvim/version.c
View File

@ -283,7 +283,7 @@ static int included_patches[] = {
//465 NA //465 NA
//464 NA //464 NA
463, 463,
//462, 462,
//461 NA //461 NA
//460 NA //460 NA
//459 NA //459 NA