diff options
| author | Björn Linse <bjorn.linse@gmail.com> | 2021-07-14 22:21:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-14 22:21:57 +0200 |
| commit | 682247b52e76180e4c49b794c6cc2548bfd32d4c (patch) | |
| tree | f43a922363a24c642a07f891c0648ac60b0a744f /src/nvim/generators/gen_options.lua | |
| parent | 19a2e59f7e80f87704ce135fff53e0efdec30432 (diff) | |
| parent | f0cc3a9480ffc30624a70ebd1e30146bc03a7029 (diff) | |
| download | rneovim-682247b52e76180e4c49b794c6cc2548bfd32d4c.tar.gz rneovim-682247b52e76180e4c49b794c6cc2548bfd32d4c.tar.bz2 rneovim-682247b52e76180e4c49b794c6cc2548bfd32d4c.zip | |
Merge pull request #15078 from bfredl/p_vim_vi
refactor(options): remove obsolete distinction of "vi" vs "vim" defaults
Diffstat (limited to 'src/nvim/generators/gen_options.lua')
| -rw-r--r-- | src/nvim/generators/gen_options.lua | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/nvim/generators/gen_options.lua b/src/nvim/generators/gen_options.lua index d80a6219eb..9f91160034 100644 --- a/src/nvim/generators/gen_options.lua +++ b/src/nvim/generators/gen_options.lua @@ -69,8 +69,6 @@ local get_flags = function(o) {'alloced'}, {'nodefault'}, {'no_mkrc'}, - {'vi_def'}, - {'vim'}, {'secure'}, {'gettext'}, {'noglob'}, @@ -120,8 +118,11 @@ local get_value = function(v) return '(char_u *) ' .. value_dumpers[type(v)](v) end -local get_defaults = function(d) - return ('{' .. get_value(d.vi) .. ', ' .. get_value(d.vim) .. '}') +local get_defaults = function(d,n) + if (d.vi == nil and d.vim == nil) or (d.vi ~= nil and d.vim ~= nil) then + error("option '"..n.."' should have one and only one default value") + end + return get_value(d.vim or d.vi) end local defines = {} @@ -170,11 +171,11 @@ local dump_option = function(i, o) if o.defaults.condition then w(get_cond(o.defaults.condition)) end - w(' .def_val=' .. get_defaults(o.defaults.if_true)) + w(' .def_val=' .. get_defaults(o.defaults.if_true, o.full_name)) if o.defaults.condition then if o.defaults.if_false then w('#else') - w(' .def_val=' .. get_defaults(o.defaults.if_false)) + w(' .def_val=' .. get_defaults(o.defaults.if_false, o.full_name)) end w('#endif') end |