diff options
| author | Björn Linse <bjorn.linse@gmail.com> | 2021-07-13 19:12:08 +0200 |
|---|---|---|
| committer | Björn Linse <bjorn.linse@gmail.com> | 2021-07-14 21:54:19 +0200 |
| commit | f0cc3a9480ffc30624a70ebd1e30146bc03a7029 (patch) | |
| tree | c9c3af0402dc215f131261697952b08aaeb6b9f9 /src/nvim/generators/gen_options.lua | |
| parent | fc869da6dc94970e9aa26d51bd605d383f4a4c4e (diff) | |
| download | rneovim-f0cc3a9480ffc30624a70ebd1e30146bc03a7029.tar.gz rneovim-f0cc3a9480ffc30624a70ebd1e30146bc03a7029.tar.bz2 rneovim-f0cc3a9480ffc30624a70ebd1e30146bc03a7029.zip | |
refactor(options): remove obsolete distinction of "vi" vs "vim" defaults
It might come as a schocking surprise, but the defaults we support
are the NEOVIM defaults.
Diffstat (limited to 'src/nvim/generators/gen_options.lua')
| -rw-r--r-- | src/nvim/generators/gen_options.lua | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/nvim/generators/gen_options.lua b/src/nvim/generators/gen_options.lua index c073918b3f..9f91160034 100644 --- a/src/nvim/generators/gen_options.lua +++ b/src/nvim/generators/gen_options.lua @@ -69,7 +69,6 @@ local get_flags = function(o) {'alloced'}, {'nodefault'}, {'no_mkrc'}, - {'vi_def'}, {'secure'}, {'gettext'}, {'noglob'}, @@ -119,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 = {} @@ -169,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 |