diff options
| author | ckelsel <ckelsel@hotmail.com> | 2017-09-24 11:06:16 +0800 |
|---|---|---|
| committer | ckelsel <ckelsel@hotmail.com> | 2017-09-24 11:47:53 +0800 |
| commit | 583b68f5a94f362c44ff29c62909969e6908438b (patch) | |
| tree | c9a49feb17f0c77331c0986b307f1eb18286422e | |
| parent | 4bb0e95abbf0a61d383d5261019a2667706c9d39 (diff) | |
| download | rneovim-583b68f5a94f362c44ff29c62909969e6908438b.tar.gz rneovim-583b68f5a94f362c44ff29c62909969e6908438b.tar.bz2 rneovim-583b68f5a94f362c44ff29c62909969e6908438b.zip | |
vim-patch:8.0.0101
Problem: Some options are not strictly checked.
Solution: Add flags for strickter checks.
https://github.com/vim/vim/commit/031cb743ae154cfb727a9b7787bdcb61202ff1c8
| -rw-r--r-- | src/nvim/option.c | 13 | ||||
| -rw-r--r-- | src/nvim/options.lua | 2 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
3 files changed, 10 insertions, 7 deletions
diff --git a/src/nvim/option.c b/src/nvim/option.c index 74250e83e6..ae1a2b1b24 100644 --- a/src/nvim/option.c +++ b/src/nvim/option.c @@ -3172,17 +3172,18 @@ did_set_string_option ( } else { // Options that are a list of flags. p = NULL; - if (varp == &p_ww) + if (varp == &p_ww) { // 'whichwrap' p = (char_u *)WW_ALL; - if (varp == &p_shm) + } + if (varp == &p_shm) { // 'shortmess' p = (char_u *)SHM_ALL; - else if (varp == &(p_cpo)) + } else if (varp == &(p_cpo)) { // 'cpoptions' p = (char_u *)CPO_VI; - else if (varp == &(curbuf->b_p_fo)) + } else if (varp == &(curbuf->b_p_fo)) { // 'formatoptions' p = (char_u *)FO_ALL; - else if (varp == &curwin->w_p_cocu) + } else if (varp == &curwin->w_p_cocu) { // 'concealcursor' p = (char_u *)COCU_ALL; - else if (varp == &p_mouse) { + } else if (varp == &p_mouse) { // 'mouse' p = (char_u *)MOUSE_ALL; } if (p != NULL) { diff --git a/src/nvim/options.lua b/src/nvim/options.lua index 103227f6b5..757fac9465 100644 --- a/src/nvim/options.lua +++ b/src/nvim/options.lua @@ -575,6 +575,7 @@ return { full_name='dictionary', abbreviation='dict', type='string', list='onecomma', scope={'global', 'buffer'}, deny_duplicates=true, + normal_fname_chars=true, vi_def=true, expand=true, varname='p_dict', @@ -1750,6 +1751,7 @@ return { { full_name='printexpr', abbreviation='pexpr', type='string', scope={'global'}, + secure=true, vi_def=true, varname='p_pexpr', defaults={if_true={vi=""}} diff --git a/src/nvim/version.c b/src/nvim/version.c index d4f9c0232f..feb69cae52 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -851,7 +851,7 @@ static const int included_patches[] = { // 104, // 103 NA // 102, - // 101, + 101, 100, 99, // 98 NA |