refactor(options): remove vi/vim default value distinction

1 files changed, 364 insertions, 367 deletions

diff --git a/src/nvim/options.lua b/src/nvim/options.lua
index 8c0970c32e..a44664d780 100644
--- a/src/nvim/options.lua
+++ b/src/nvim/options.lua
@@ -6,7 +6,7 @@
 --    type='number', list=nil, scope={'global'},
 --    deny_duplicates=nil,
 --    enable_if=nil,
---    defaults={condition=nil, if_true={vi=224, vim=0}, if_false=nil},
+--    defaults={condition=nil, if_true=224, if_false=nil},
 --    secure=nil, gettext=nil, noglob=nil, normal_fname_chars=nil,
 --    pri_mkrc=nil, deny_in_modelines=nil, normal_dname_chars=nil,
 --    modelineexpr=nil,
@@ -21,7 +21,6 @@
 -- scopes: global, buffer, window
 -- redraw options: statuslines, current_window, curent_window_only,
 --                 current_buffer, all_windows, everything, curswant
--- default: {vi=…[, vim=…]}
 -- defaults: {condition=#if condition, if_true=default, if_false=default}
 -- #if condition:
 --    string: #ifdef string
@@ -57,14 +56,14 @@ return {
       type='number', scope={'global'},
       redraw={'curswant'},
       varname='p_aleph',
-      defaults={if_true={vi=224}}
+      defaults={if_true=224}
     },
     {
       full_name='arabic', abbreviation='arab',
       short_desc=N_("Arabic as a default second language"),
       type='bool', scope={'window'},
       redraw={'curswant'},
-      defaults={if_true={vi=false}}
+      defaults={if_true=false}
     },
     {
       full_name='arabicshape', abbreviation='arshape',
@@ -73,14 +72,14 @@ return {
       redraw={'all_windows', 'ui_option'},
 
       varname='p_arshape',
-      defaults={if_true={vi=true}}
+      defaults={if_true=true}
     },
     {
       full_name='allowrevins', abbreviation='ari',
       short_desc=N_("allow CTRL-_ in Insert and Command-line mode"),
       type='bool', scope={'global'},
       varname='p_ari',
-      defaults={if_true={vi=false}}
+      defaults={if_true=false}
     },
     {
       full_name='ambiwidth', abbreviation='ambw',
@@ -88,42 +87,42 @@ return {
       type='string', scope={'global'},
       redraw={'all_windows', 'ui_option'},
       varname='p_ambw',
-      defaults={if_true={vi="single"}}
+      defaults={if_true="single"}
     },
     {
       full_name='autochdir', abbreviation='acd',
       short_desc=N_("change directory to the file in the current window"),
       type='bool', scope={'global'},
       varname='p_acd',
-      defaults={if_true={vi=false}}
+      defaults={if_true=false}
     },
     {
       full_name='autoindent', abbreviation='ai',
       short_desc=N_("take indent for new line from previous line"),
       type='bool', scope={'buffer'},
       varname='p_ai',
-      defaults={if_true={vim=true}}
+      defaults={if_true=true}
     },
     {
       full_name='autoread', abbreviation='ar',
       short_desc=N_("autom. read file when changed outside of Vim"),
       type='bool', scope={'global', 'buffer'},
       varname='p_ar',
-      defaults={if_true={vim=true}}
+      defaults={if_true=true}
     },
     {
       full_name='autowrite', abbreviation='aw',
       short_desc=N_("automatically write file if changed"),
       type='bool', scope={'global'},
       varname='p_aw',
-      defaults={if_true={vi=false}}
+      defaults={if_true=false}
     },
     {
       full_name='autowriteall', abbreviation='awa',
       short_desc=N_("as 'autowrite', but works with more commands"),
       type='bool', scope={'global'},
       varname='p_awa',
-      defaults={if_true={vi=false}}
+      defaults={if_true=false}
     },
     {
       full_name='background', abbreviation='bg',
@@ -131,7 +130,7 @@ return {
       type='string', scope={'global'},
       redraw={'all_windows'},
       varname='p_bg',
-      defaults={if_true={vim="dark"}}
+      defaults={if_true="dark"}
     },
     {
       full_name='backspace', abbreviation='bs',
@@ -139,14 +138,14 @@ return {
       type='string', list='onecomma', scope={'global'},
       deny_duplicates=true,
       varname='p_bs',
-      defaults={if_true={vim="indent,eol,start"}}
+      defaults={if_true="indent,eol,start"}
     },
     {
       full_name='backup', abbreviation='bk',
       short_desc=N_("keep backup file after overwriting a file"),
       type='bool', scope={'global'},
       varname='p_bk',
-      defaults={if_true={vi=false}}
+      defaults={if_true=false}
     },
     {
       full_name='backupcopy', abbreviation='bkc',
@@ -156,8 +155,8 @@ return {
       varname='p_bkc',
       defaults={
         condition='UNIX',
-        if_true={vim="auto"},
-        if_false={vim="auto"}
+        if_true="auto",
+        if_false="auto"
       },
     },
     {
@@ -168,7 +167,7 @@ return {
       secure=true,
       expand='nodefault',
       varname='p_bdir',
-      defaults={if_true={vi=''}}
+      defaults={if_true=''}
     },
     {
       full_name='backupext', abbreviation='bex',
@@ -176,7 +175,7 @@ return {
       type='string', scope={'global'},
       normal_fname_chars=true,
       varname='p_bex',
-      defaults={if_true={vi="~"}}
+      defaults={if_true="~"}
     },
     {
       full_name='backupskip', abbreviation='bsk',
@@ -184,7 +183,7 @@ return {
       type='string', list='onecomma', scope={'global'},
       deny_duplicates=true,
       varname='p_bsk',
-      defaults={if_true={vi=""}}
+      defaults={if_true=""}
     },
     {
       full_name='belloff', abbreviation='bo',
@@ -192,7 +191,7 @@ return {
       type='string', list='comma', scope={'global'},
       deny_duplicates=true,
       varname='p_bo',
-      defaults={if_true={vi="all"}}
+      defaults={if_true="all"}
     },
     {
       full_name='binary', abbreviation='bin',
@@ -200,7 +199,7 @@ return {
       type='bool', scope={'buffer'},
       redraw={'statuslines'},
       varname='p_bin',
-      defaults={if_true={vi=false}}
+      defaults={if_true=false}
     },
     {
       full_name='bomb',
@@ -209,7 +208,7 @@ return {
       no_mkrc=true,
       redraw={'statuslines'},
       varname='p_bomb',
-      defaults={if_true={vi=false}}
+      defaults={if_true=false}
     },
     {
       full_name='breakat', abbreviation='brk',
@@ -217,14 +216,14 @@ return {
       type='string', list='flags', scope={'global'},
       redraw={'all_windows'},
       varname='p_breakat',
-      defaults={if_true={vi=" \t!@*-+;:,./?"}}
+      defaults={if_true=" \t!@*-+;:,./?"}
     },
     {
       full_name='breakindent', abbreviation='bri',
       short_desc=N_("wrapped line repeats indent"),
       type='bool', scope={'window'},
       redraw={'current_window'},
-      defaults={if_true={vi=false}}
+      defaults={if_true=false}
     },
     {
       full_name='breakindentopt', abbreviation='briopt',
@@ -233,7 +232,7 @@ return {
       deny_duplicates=true,
       alloced=true,
       redraw={'current_buffer'},
-      defaults={if_true={vi=""}},
+      defaults={if_true=""},
     },
     {
       full_name='browsedir', abbreviation='bsdir',
@@ -248,7 +247,7 @@ return {
       noglob=true,
       alloced=true,
       varname='p_bh',
-      defaults={if_true={vi=""}}
+      defaults={if_true=""}
     },
     {
       full_name='buflisted', abbreviation='bl',
@@ -256,7 +255,7 @@ return {
       type='bool', scope={'buffer'},
       noglob=true,
       varname='p_bl',
-      defaults={if_true={vi=1}}
+      defaults={if_true=1}
     },
     {
       full_name='buftype', abbreviation='bt',
@@ -265,7 +264,7 @@ return {
       noglob=true,
       alloced=true,
       varname='p_bt',
-      defaults={if_true={vi=""}}
+      defaults={if_true=""}
     },
     {
       full_name='casemap', abbreviation='cmp',
@@ -273,7 +272,7 @@ return {
       type='string', list='onecomma', scope={'global'},
       deny_duplicates=true,
       varname='p_cmp',
-      defaults={if_true={vi="internal,keepascii"}}
+      defaults={if_true="internal,keepascii"}
     },
     {
       full_name='cdpath', abbreviation='cd',
@@ -283,14 +282,14 @@ return {
       expand=true,
       secure=true,
       varname='p_cdpath',
-      defaults={if_true={vi=",,"}}
+      defaults={if_true=",,"}
     },
     {
       full_name='cedit',
       short_desc=N_("used to open the command-line window"),
       type='string', scope={'global'},
       varname='p_cedit',
-      defaults={if_true={vim=macros('CTRL_F_STR')}}
+      defaults={if_true=macros('CTRL_F_STR')}
     },
     {
       full_name='channel',
@@ -299,7 +298,7 @@ return {
       no_mkrc=true,
       nodefault=true,
       varname='p_channel',
-      defaults={if_true={vi=0}}
+      defaults={if_true=0}
     },
     {
       full_name='charconvert', abbreviation='ccv',
@@ -307,14 +306,14 @@ return {
       type='string', scope={'global'},
       secure=true,
       varname='p_ccv',
-      defaults={if_true={vi=""}}
+      defaults={if_true=""}
     },
     {
       full_name='cindent', abbreviation='cin',
       short_desc=N_("do C program indenting"),
       type='bool', scope={'buffer'},
       varname='p_cin',
-      defaults={if_true={vi=false}}
+      defaults={if_true=false}
     },
     {
       full_name='cinkeys', abbreviation='cink',
@@ -323,7 +322,7 @@ return {
       deny_duplicates=true,
       alloced=true,
       varname='p_cink',
-      defaults={if_true={vi=indentkeys_default}}
+      defaults={if_true=indentkeys_default}
     },
     {
       full_name='cinoptions', abbreviation='cino',
@@ -332,7 +331,7 @@ return {
       deny_duplicates=true,
       alloced=true,
       varname='p_cino',
-      defaults={if_true={vi=""}}
+      defaults={if_true=""}
     },
     {
       full_name='cinwords', abbreviation='cinw',
@@ -341,7 +340,7 @@ return {
       deny_duplicates=true,
       alloced=true,
       varname='p_cinw',
-      defaults={if_true={vi="if,else,while,do,for,switch"}}
+      defaults={if_true="if,else,while,do,for,switch"}
     },
     {
       full_name='clipboard', abbreviation='cb',
@@ -349,7 +348,7 @@ return {
       type='string', list='onecomma', scope={'global'},
       deny_duplicates=true,
       varname='p_cb',
-      defaults={if_true={vi=""}}
+      defaults={if_true=""}
     },
     {
       full_name='cmdheight', abbreviation='ch',
@@ -357,14 +356,14 @@ return {
       type='number', scope={'global'},
       redraw={'all_windows'},
       varname='p_ch',
-      defaults={if_true={vi=1}}
+      defaults={if_true=1}
     },
     {
       full_name='cmdwinheight', abbreviation='cwh',
       short_desc=N_("height of the command-line window"),
       type='number', scope={'global'},
       varname='p_cwh',
-      defaults={if_true={vi=7}}
+      defaults={if_true=7}
     },
     {
       full_name='colorcolumn', abbreviation='cc',
@@ -372,7 +371,7 @@ return {
       type='string', list='onecomma', scope={'window'},
       deny_duplicates=true,
       redraw={'current_window'},
-      defaults={if_true={vi=""}}
+      defaults={if_true=""}
     },
     {
       full_name='columns', abbreviation='co',
@@ -381,7 +380,7 @@ return {
       no_mkrc=true,
       redraw={'everything'},
       varname='p_columns',
-      defaults={if_true={vi=macros('DFLT_COLS')}}
+      defaults={if_true=macros('DFLT_COLS')}
     },
     {
       full_name='comments', abbreviation='com',
@@ -391,7 +390,7 @@ return {
       alloced=true,
       redraw={'curswant'},
       varname='p_com',
-      defaults={if_true={vi="s1:/*,mb:*,ex:*/,://,b:#,:%,:XCOMM,n:>,fb:-"}}
+      defaults={if_true="s1:/*,mb:*,ex:*/,://,b:#,:%,:XCOMM,n:>,fb:-"}
     },
     {
       full_name='commentstring', abbreviation='cms',
@@ -400,7 +399,7 @@ return {
       alloced=true,
       redraw={'curswant'},
       varname='p_cms',
-      defaults={if_true={vi="/*%s*/"}}
+      defaults={if_true="/*%s*/"}
     },
     {
       full_name='compatible', abbreviation='cp',
@@ -410,7 +409,7 @@ return {
       varname='p_force_off',
       -- pri_mkrc isn't needed here, optval_default()
       -- always returns TRUE for 'compatible'
-      defaults={if_true={vim=false}}
+      defaults={if_true=false}
     },
     {
       full_name='complete', abbreviation='cpt',
@@ -419,7 +418,7 @@ return {
       deny_duplicates=true,
       alloced=true,
       varname='p_cpt',
-      defaults={if_true={vim=".,w,b,u,t"}}
+      defaults={if_true=".,w,b,u,t"}
     },
     {
       full_name='concealcursor', abbreviation='cocu',
@@ -427,14 +426,14 @@ return {
       type='string', scope={'window'},
       alloced=true,
       redraw={'current_window'},
-      defaults={if_true={vi=""}}
+      defaults={if_true=""}
     },
     {
       full_name='conceallevel', abbreviation='cole',
       short_desc=N_("whether concealable text is shown or hidden"),
       type='number', scope={'window'},
       redraw={'current_window'},
-      defaults={if_true={vi=0}}
+      defaults={if_true=0}
     },
     {
       full_name='completefunc', abbreviation='cfu',
@@ -443,7 +442,7 @@ return {
       secure=true,
       alloced=true,
       varname='p_cfu',
-      defaults={if_true={vi=""}}
+      defaults={if_true=""}
     },
     {
       full_name='completeopt', abbreviation='cot',
@@ -451,28 +450,28 @@ return {
       type='string', list='onecomma', scope={'global'},
       deny_duplicates=true,
       varname='p_cot',
-      defaults={if_true={vi="menu,preview"}}
+      defaults={if_true="menu,preview"}
     },
     {
       full_name='completeslash', abbreviation='csl',
       type='string', scope={'buffer'},
       varname='p_csl',
       enable_if='BACKSLASH_IN_FILENAME',
-      defaults={if_true={vi=""}}
+      defaults={if_true=""}
     },
     {
       full_name='confirm', abbreviation='cf',
       short_desc=N_("ask what to do about unsaved/read-only files"),
       type='bool', scope={'global'},
       varname='p_confirm',
-      defaults={if_true={vi=false}}
+      defaults={if_true=false}
     },
     {
       full_name='copyindent', abbreviation='ci',
       short_desc=N_("make 'autoindent' use existing indent structure"),
       type='bool', scope={'buffer'},
       varname='p_ci',
-      defaults={if_true={vi=false}}
+      defaults={if_true=false}
     },
     {
       full_name='cpoptions', abbreviation='cpo',
@@ -480,14 +479,14 @@ return {
       type='string', list='flags', scope={'global'},
       redraw={'all_windows'},
       varname='p_cpo',
-      defaults={if_true={vim=macros('CPO_VIM')}}
+      defaults={if_true=macros('CPO_VIM')}
     },
     {
       full_name='cscopepathcomp', abbreviation='cspc',
       short_desc=N_("how many components of the path to show"),
       type='number', scope={'global'},
       varname='p_cspc',
-      defaults={if_true={vi=0}}
+      defaults={if_true=0}
     },
     {
       full_name='cscopeprg', abbreviation='csprg',
@@ -496,7 +495,7 @@ return {
       secure=true,
       expand=true,
       varname='p_csprg',
-      defaults={if_true={vi="cscope"}}
+      defaults={if_true="cscope"}
     },
     {
       full_name='cscopequickfix', abbreviation='csqf',
@@ -504,56 +503,56 @@ return {
       type='string', list='onecomma', scope={'global'},
       deny_duplicates=true,
       varname='p_csqf',
-      defaults={if_true={vi=""}}
+      defaults={if_true=""}
     },
     {
       full_name='cscoperelative', abbreviation='csre',
       short_desc=N_("Use cscope.out path basename as prefix"),
       type='bool', scope={'global'},
       varname='p_csre',
-      defaults={if_true={vi=0}}
+      defaults={if_true=0}
     },
     {
       full_name='cscopetag', abbreviation='cst',
       short_desc=N_("use cscope for tag commands"),
       type='bool', scope={'global'},
       varname='p_cst',
-      defaults={if_true={vi=0}}
+      defaults={if_true=0}
     },
     {
       full_name='cscopetagorder', abbreviation='csto',
       short_desc=N_("determines \":cstag\" search order"),
       type='number', scope={'global'},
       varname='p_csto',
-      defaults={if_true={vi=0}}
+      defaults={if_true=0}
     },
     {
       full_name='cscopeverbose', abbreviation='csverb',
       short_desc=N_("give messages when adding a cscope database"),
       type='bool', scope={'global'},
       varname='p_csverbose',
-      defaults={if_true={vi=1}}
+      defaults={if_true=1}
     },
     {
       full_name='cursorbind', abbreviation='crb',
       short_desc=N_("move cursor in window as it moves in other windows"),
       type='bool', scope={'window'},
       pv_name='p_crbind',
-      defaults={if_true={vi=false}}
+      defaults={if_true=false}
     },
     {
       full_name='cursorcolumn', abbreviation='cuc',
       short_desc=N_("highlight the screen column of the cursor"),
       type='bool', scope={'window'},
       redraw={'current_window_only'},
-      defaults={if_true={vi=false}}
+      defaults={if_true=false}
     },
     {
       full_name='cursorline', abbreviation='cul',
       short_desc=N_("highlight the screen line of the cursor"),
       type='bool', scope={'window'},
       redraw={'current_window_only'},
-      defaults={if_true={vi=false}}
+      defaults={if_true=false}
     },
     {
       full_name='cursorlineopt', abbreviation='culopt',
@@ -561,14 +560,14 @@ return {
       type='string', list='onecomma', scope={'window'},
       deny_duplicates=true,
       redraw={'current_window_only'},
-      defaults={if_true={vi="both"}}
+      defaults={if_true="both"}
     },
     {
       full_name='debug',
       short_desc=N_("to \"msg\" to see all error messages"),
       type='string', scope={'global'},
       varname='p_debug',
-      defaults={if_true={vi=""}}
+      defaults={if_true=""}
     },
     {
       full_name='define', abbreviation='def',
@@ -577,14 +576,14 @@ return {
       alloced=true,
       redraw={'curswant'},
       varname='p_def',
-      defaults={if_true={vi="^\\s*#\\s*define"}}
+      defaults={if_true="^\\s*#\\s*define"}
     },
     {
       full_name='delcombine', abbreviation='deco',
       short_desc=N_("delete combining characters on their own"),
       type='bool', scope={'global'},
       varname='p_deco',
-      defaults={if_true={vi=false}}
+      defaults={if_true=false}
     },
     {
       full_name='dictionary', abbreviation='dict',
@@ -594,7 +593,7 @@ return {
       normal_dname_chars=true,
       expand=true,
       varname='p_dict',
-      defaults={if_true={vi=""}}
+      defaults={if_true=""}
     },
     {
       full_name='diff',
@@ -602,7 +601,7 @@ return {
       type='bool', scope={'window'},
       noglob=true,
       redraw={'current_window'},
-      defaults={if_true={vi=false}}
+      defaults={if_true=false}
     },
     {
       full_name='diffexpr', abbreviation='dex',
@@ -611,7 +610,7 @@ return {
       secure=true,
       redraw={'curswant'},
       varname='p_dex',
-      defaults={if_true={vi=""}}
+      defaults={if_true=""}
     },
     {
       full_name='diffopt', abbreviation='dip',
@@ -621,14 +620,14 @@ return {
       alloced=true,
       redraw={'current_window'},
       varname='p_dip',
-      defaults={if_true={vi="internal,filler,closeoff"}}
+      defaults={if_true="internal,filler,closeoff"}
     },
     {
       full_name='digraph', abbreviation='dg',
       short_desc=N_("enable the entering of digraphs in Insert mode"),
       type='bool', scope={'global'},
       varname='p_dg',
-      defaults={if_true={vi=false}}
+      defaults={if_true=false}
     },
     {
       full_name='directory', abbreviation='dir',
@@ -638,7 +637,7 @@ return {
       secure=true,
       expand='nodefault',
       varname='p_dir',
-      defaults={if_true={vi=''}}
+      defaults={if_true=''}
     },
     {
       full_name='display', abbreviation='dy',
@@ -647,21 +646,21 @@ return {
       deny_duplicates=true,
       redraw={'all_windows'},
       varname='p_dy',
-      defaults={if_true={vim="lastline,msgsep"}}
+      defaults={if_true="lastline,msgsep"}
     },
     {
       full_name='eadirection', abbreviation='ead',
       short_desc=N_("in which direction 'equalalways' works"),
       type='string', scope={'global'},
       varname='p_ead',
-      defaults={if_true={vi="both"}}
+      defaults={if_true="both"}
     },
     {
       full_name='edcompatible', abbreviation='ed',
 	  short_desc=N_("No description"),
       type='bool', scope={'global'},
       varname='p_force_off',
-      defaults={if_true={vi=false}}
+      defaults={if_true=false}
     },
     {
       full_name='emoji', abbreviation='emo',
@@ -669,7 +668,7 @@ return {
       type='bool', scope={'global'},
       redraw={'all_windows', 'ui_option'},
       varname='p_emoji',
-      defaults={if_true={vi=true}}
+      defaults={if_true=true}
     },
     {
       full_name='encoding', abbreviation='enc',
@@ -677,7 +676,7 @@ return {
       type='string', scope={'global'},
       deny_in_modelines=true,
       varname='p_enc',
-      defaults={if_true={vi=macros('ENC_DFLT')}}
+      defaults={if_true=macros('ENC_DFLT')}
     },
     {
       full_name='endofline', abbreviation='eol',
@@ -686,7 +685,7 @@ return {
       no_mkrc=true,
       redraw={'statuslines'},
       varname='p_eol',
-      defaults={if_true={vi=true}}
+      defaults={if_true=true}
     },
     {
       full_name='equalalways', abbreviation='ea',
@@ -694,7 +693,7 @@ return {
       type='bool', scope={'global'},
       redraw={'all_windows'},
       varname='p_ea',
-      defaults={if_true={vi=true}}
+      defaults={if_true=true}
     },
     {
       full_name='equalprg', abbreviation='ep',
@@ -703,14 +702,14 @@ return {
       secure=true,
       expand=true,
       varname='p_ep',
-      defaults={if_true={vi=""}}
+      defaults={if_true=""}
     },
     {
       full_name='errorbells', abbreviation='eb',
       short_desc=N_("ring the bell for error messages"),
       type='bool', scope={'global'},
       varname='p_eb',
-      defaults={if_true={vi=false}}
+      defaults={if_true=false}
     },
     {
       full_name='errorfile', abbreviation='ef',
@@ -719,7 +718,7 @@ return {
       secure=true,
       expand=true,
       varname='p_ef',
-      defaults={if_true={vi=macros('DFLT_ERRORFILE')}}
+      defaults={if_true=macros('DFLT_ERRORFILE')}
     },
     {
       full_name='errorformat', abbreviation='efm',
@@ -727,7 +726,7 @@ return {
       type='string', list='onecomma', scope={'global', 'buffer'},
       deny_duplicates=true,
       varname='p_efm',
-      defaults={if_true={vi=macros('DFLT_EFM')}}
+      defaults={if_true=macros('DFLT_EFM')}
     },
     {
       full_name='eventignore', abbreviation='ei',
@@ -735,14 +734,14 @@ return {
       type='string', list='onecomma', scope={'global'},
       deny_duplicates=true,
       varname='p_ei',
-      defaults={if_true={vi=""}}
+      defaults={if_true=""}
     },
     {
       full_name='expandtab', abbreviation='et',
       short_desc=N_("use spaces when <Tab> is inserted"),
       type='bool', scope={'buffer'},
       varname='p_et',
-      defaults={if_true={vi=false}}
+      defaults={if_true=false}
     },
     {
       full_name='exrc', abbreviation='ex',
@@ -750,7 +749,7 @@ return {
       type='bool', scope={'global'},
       secure=true,
       varname='p_exrc',
-      defaults={if_true={vi=false}}
+      defaults={if_true=false}
     },
     {
       full_name='fileencoding', abbreviation='fenc',
@@ -760,7 +759,7 @@ return {
       alloced=true,
       redraw={'statuslines', 'current_buffer'},
       varname='p_fenc',
-      defaults={if_true={vi=""}}
+      defaults={if_true=""}
     },
     {
       full_name='fileencodings', abbreviation='fencs',
@@ -768,7 +767,7 @@ return {
       type='string', list='onecomma', scope={'global'},
       deny_duplicates=true,
       varname='p_fencs',
-      defaults={if_true={vi="ucs-bom,utf-8,default,latin1"}}
+      defaults={if_true="ucs-bom,utf-8,default,latin1"}
     },
     {
       full_name='fileformat', abbreviation='ff',
@@ -778,7 +777,7 @@ return {
       alloced=true,
       redraw={'curswant', 'statuslines'},
       varname='p_ff',
-      defaults={if_true={vi=macros('DFLT_FF')}}
+      defaults={if_true=macros('DFLT_FF')}
     },
     {
       full_name='fileformats', abbreviation='ffs',
@@ -786,7 +785,7 @@ return {
       type='string', list='onecomma', scope={'global'},
       deny_duplicates=true,
       varname='p_ffs',
-      defaults={if_true={vim=macros('DFLT_FFS_VIM')}}
+      defaults={if_true=macros('DFLT_FFS_VIM')}
     },
     {
       full_name='fileignorecase', abbreviation='fic',
@@ -795,8 +794,8 @@ return {
       varname='p_fic',
       defaults={
         condition='CASE_INSENSITIVE_FILENAME',
-        if_true={vi=true},
-        if_false={vi=false},
+        if_true=true,
+        if_false=false,
       }
     },
     {
@@ -808,7 +807,7 @@ return {
       alloced=true,
       expand=true,
       varname='p_ft',
-      defaults={if_true={vi=""}}
+      defaults={if_true=""}
     },
     {
       full_name='fillchars', abbreviation='fcs',
@@ -818,7 +817,7 @@ return {
       alloced=true,
       redraw={'current_window'},
       varname='p_fcs',
-      defaults={if_true={vi=''}}
+      defaults={if_true=''}
     },
     {
       full_name='fixendofline', abbreviation='fixeol',
@@ -826,7 +825,7 @@ return {
       type='bool', scope={'buffer'},
       redraw={'statuslines'},
       varname='p_fixeol',
-      defaults={if_true={vi=true}}
+      defaults={if_true=true}
     },
     {
       full_name='foldclose', abbreviation='fcl',
@@ -835,7 +834,7 @@ return {
       deny_duplicates=true,
       redraw={'current_window'},
       varname='p_fcl',
-      defaults={if_true={vi=""}}
+      defaults={if_true=""}
     },
     {
       full_name='foldcolumn', abbreviation='fdc',
@@ -843,14 +842,14 @@ return {
       type='string', scope={'window'},
       alloced=true,
       redraw={'current_window'},
-      defaults={if_true={vi="0"}}
+      defaults={if_true="0"}
     },
     {
       full_name='foldenable', abbreviation='fen',
       short_desc=N_("set to display all folds open"),
       type='bool', scope={'window'},
       redraw={'current_window'},
-      defaults={if_true={vi=true}}
+      defaults={if_true=true}
     },
     {
       full_name='foldexpr', abbreviation='fde',
@@ -859,7 +858,7 @@ return {
       modelineexpr=true,
       alloced=true,
       redraw={'current_window'},
-      defaults={if_true={vi="0"}}
+      defaults={if_true="0"}
     },
     {
       full_name='foldignore', abbreviation='fdi',
@@ -867,14 +866,14 @@ return {
       type='string', scope={'window'},
       alloced=true,
       redraw={'current_window'},
-      defaults={if_true={vi="#"}}
+      defaults={if_true="#"}
     },
     {
       full_name='foldlevel', abbreviation='fdl',
       short_desc=N_("close folds with a level higher than this"),
       type='number', scope={'window'},
       redraw={'current_window'},
-      defaults={if_true={vi=0}}
+      defaults={if_true=0}
     },
     {
       full_name='foldlevelstart', abbreviation='fdls',
@@ -882,7 +881,7 @@ return {
       type='number', scope={'global'},
       redraw={'curswant'},
       varname='p_fdls',
-      defaults={if_true={vi=-1}}
+      defaults={if_true=-1}
     },
     {
       full_name='foldmarker', abbreviation='fmr',
@@ -891,7 +890,7 @@ return {
       deny_duplicates=true,
       alloced=true,
       redraw={'current_window'},
-      defaults={if_true={vi="{{{,}}}"}}
+      defaults={if_true="{{{,}}}"}
     },
     {
       full_name='foldmethod', abbreviation='fdm',
@@ -899,21 +898,21 @@ return {
       type='string', scope={'window'},
       alloced=true,
       redraw={'current_window'},
-      defaults={if_true={vi="manual"}}
+      defaults={if_true="manual"}
     },
     {
       full_name='foldminlines', abbreviation='fml',
       short_desc=N_("minimum number of lines for a fold to be closed"),
       type='number', scope={'window'},
       redraw={'current_window'},
-      defaults={if_true={vi=1}}
+      defaults={if_true=1}
     },
     {
       full_name='foldnestmax', abbreviation='fdn',
       short_desc=N_("maximum fold depth"),
       type='number', scope={'window'},
       redraw={'current_window'},
-      defaults={if_true={vi=20}}
+      defaults={if_true=20}
     },
     {
       full_name='foldopen', abbreviation='fdo',
@@ -922,7 +921,7 @@ return {
       deny_duplicates=true,
       redraw={'curswant'},
       varname='p_fdo',
-      defaults={if_true={vi="block,hor,mark,percent,quickfix,search,tag,undo"}}
+      defaults={if_true="block,hor,mark,percent,quickfix,search,tag,undo"}
     },
     {
       full_name='foldtext', abbreviation='fdt',
@@ -931,7 +930,7 @@ return {
       modelineexpr=true,
       alloced=true,
       redraw={'current_window'},
-      defaults={if_true={vi="foldtext()"}}
+      defaults={if_true="foldtext()"}
     },
     {
       full_name='formatexpr', abbreviation='fex',
@@ -940,7 +939,7 @@ return {
       modelineexpr=true,
       alloced=true,
       varname='p_fex',
-      defaults={if_true={vi=""}}
+      defaults={if_true=""}
     },
     {
       full_name='formatoptions', abbreviation='fo',
@@ -948,7 +947,7 @@ return {
       type='string', list='flags', scope={'buffer'},
       alloced=true,
       varname='p_fo',
-      defaults={if_true={vim=macros('DFLT_FO_VIM')}}
+      defaults={if_true=macros('DFLT_FO_VIM')}
     },
     {
       full_name='formatlistpat', abbreviation='flp',
@@ -956,7 +955,7 @@ return {
       type='string', scope={'buffer'},
       alloced=true,
       varname='p_flp',
-      defaults={if_true={vi="^\\s*\\d\\+[\\]:.)}\\t ]\\s*"}}
+      defaults={if_true="^\\s*\\d\\+[\\]:.)}\\t ]\\s*"}
     },
     {
       full_name='formatprg', abbreviation='fp',
@@ -965,7 +964,7 @@ return {
       secure=true,
       expand=true,
       varname='p_fp',
-      defaults={if_true={vi=""}}
+      defaults={if_true=""}
     },
     {
       full_name='fsync', abbreviation='fs',
@@ -973,14 +972,14 @@ return {
       type='bool', scope={'global'},
       secure=true,
       varname='p_fs',
-      defaults={if_true={vi=false}}
+      defaults={if_true=false}
     },
     {
       full_name='gdefault', abbreviation='gd',
       short_desc=N_("the \":substitute\" flag 'g' is default on"),
       type='bool', scope={'global'},
       varname='p_gd',
-      defaults={if_true={vi=false}}
+      defaults={if_true=false}
     },
     {
       full_name='grepformat', abbreviation='gfm',
@@ -988,7 +987,7 @@ return {
       type='string', list='onecomma', scope={'global'},
       deny_duplicates=true,
       varname='p_gefm',
-      defaults={if_true={vi=macros('DFLT_GREPFORMAT')}}
+      defaults={if_true=macros('DFLT_GREPFORMAT')}
     },
     {
       full_name='grepprg', abbreviation='gp',
@@ -1001,8 +1000,8 @@ return {
         condition='WIN32',
         -- Add an extra file name so that grep will always
         -- insert a file name in the match line. */
-        if_true={vi="findstr /n $* nul"},
-        if_false={vi="grep -n $* /dev/null"}
+        if_true="findstr /n $* nul",
+        if_false="grep -n $* /dev/null"
       }
     },
     {
@@ -1011,7 +1010,7 @@ return {
       type='string', list='onecomma', scope={'global'},
       deny_duplicates=true,
       varname='p_guicursor',
-      defaults={if_true={vi="n-v-c-sm:block,i-ci-ve:ver25,r-cr-o:hor20"}}
+      defaults={if_true="n-v-c-sm:block,i-ci-ve:ver25,r-cr-o:hor20"}
     },
     {
       full_name='guifont', abbreviation='gfn',
@@ -1020,7 +1019,7 @@ return {
       deny_duplicates=true,
       varname='p_guifont',
       redraw={'ui_option'},
-      defaults={if_true={vi=""}}
+      defaults={if_true=""}
     },
     {
       full_name='guifontwide', abbreviation='gfw',
@@ -1029,7 +1028,7 @@ return {
       deny_duplicates=true,
       redraw={'ui_option'},
       varname='p_guifontwide',
-      defaults={if_true={vi=""}}
+      defaults={if_true=""}
     },
     {
       full_name='guioptions', abbreviation='go',
@@ -1060,14 +1059,14 @@ return {
       secure=true,
       expand=true,
       varname='p_hf',
-      defaults={if_true={vi=macros('DFLT_HELPFILE')}}
+      defaults={if_true=macros('DFLT_HELPFILE')}
     },
     {
       full_name='helpheight', abbreviation='hh',
       short_desc=N_("minimum height of a new help window"),
       type='number', scope={'global'},
       varname='p_hh',
-      defaults={if_true={vi=20}}
+      defaults={if_true=20}
     },
     {
       full_name='helplang', abbreviation='hlg',
@@ -1075,14 +1074,14 @@ return {
       type='string', list='onecomma', scope={'global'},
       deny_duplicates=true,
       varname='p_hlg',
-      defaults={if_true={vi=""}}
+      defaults={if_true=""}
     },
     {
       full_name='hidden', abbreviation='hid',
       short_desc=N_("don't unload buffer when it is |abandon|ed"),
       type='bool', scope={'global'},
       varname='p_hid',
-      defaults={if_true={vi=false}}
+      defaults={if_true=false}
     },
     {
       full_name='highlight', abbreviation='hl',
@@ -1090,28 +1089,28 @@ return {
       type='string', list='onecomma', scope={'global'},
       deny_duplicates=true,
       varname='p_hl',
-      defaults={if_true={vi=macros('HIGHLIGHT_INIT')}}
+      defaults={if_true=macros('HIGHLIGHT_INIT')}
     },
     {
       full_name='history', abbreviation='hi',
       short_desc=N_("number of command-lines that are remembered"),