options.lua: add short descriptions (#6288)

add one-liner option descriptions in src/nvim/options.lua
They are taken from optwin.vim and should be easier to use in a
programmatic manner, for instance in a "palette", like in telescope
`:Telescope vim_options`.

1 files changed, 354 insertions, 0 deletions

diff --git a/src/nvim/options.lua b/src/nvim/options.lua
index 65ef7a4527..64a09dc2b4 100644
--- a/src/nvim/options.lua
+++ b/src/nvim/options.lua
@@ -1,6 +1,7 @@
 -- {
 --  {
 --    full_name='aleph', abbreviation='al',
+--    short_desc="ASCII code of the letter Aleph (Hebrew)",
 --    varname='p_aleph', pv_name=nil,
 --    type='number', list=nil, scope={'global'},
 --    deny_duplicates=nil,
@@ -52,6 +53,7 @@ return {
   options={
     {
       full_name='aleph', abbreviation='al',
+      short_desc=N_("ASCII code of the letter Aleph (Hebrew)"),
       type='number', scope={'global'},
       vi_def=true,
       redraw={'curswant'},
@@ -60,6 +62,7 @@ return {
     },
     {
       full_name='arabic', abbreviation='arab',
+      short_desc=N_("Arabic as a default second language"),
       type='bool', scope={'window'},
       vi_def=true,
       vim=true,
@@ -68,6 +71,7 @@ return {
     },
     {
       full_name='arabicshape', abbreviation='arshape',
+      short_desc=N_("do shaping for Arabic characters"),
       type='bool', scope={'global'},
       vi_def=true,
       vim=true,
@@ -78,6 +82,7 @@ return {
     },
     {
       full_name='allowrevins', abbreviation='ari',
+      short_desc=N_("allow CTRL-_ in Insert and Command-line mode"),
       type='bool', scope={'global'},
       vi_def=true,
       vim=true,
@@ -86,6 +91,7 @@ return {
     },
     {
       full_name='ambiwidth', abbreviation='ambw',
+      short_desc=N_("what to do with Unicode chars of ambiguous width"),
       type='string', scope={'global'},
       vi_def=true,
       redraw={'all_windows', 'ui_option'},
@@ -94,6 +100,7 @@ return {
     },
     {
       full_name='autochdir', abbreviation='acd',
+      short_desc=N_("change directory to the file in the current window"),
       type='bool', scope={'global'},
       vi_def=true,
       varname='p_acd',
@@ -101,18 +108,21 @@ return {
     },
     {
       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={vi=false, vim=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={vi=false, vim=true}}
     },
     {
       full_name='autowrite', abbreviation='aw',
+      short_desc=N_("automatically write file if changed"),
       type='bool', scope={'global'},
       vi_def=true,
       varname='p_aw',
@@ -120,6 +130,7 @@ return {
     },
     {
       full_name='autowriteall', abbreviation='awa',
+      short_desc=N_("as 'autowrite', but works with more commands"),
       type='bool', scope={'global'},
       vi_def=true,
       varname='p_awa',
@@ -127,6 +138,7 @@ return {
     },
     {
       full_name='background', abbreviation='bg',
+      short_desc=N_("\"dark\" or \"light\", used for highlight colors"),
       type='string', scope={'global'},
       vim=true,
       redraw={'all_windows'},
@@ -135,6 +147,7 @@ return {
     },
     {
       full_name='backspace', abbreviation='bs',
+      short_desc=N_("how backspace works at start of line"),
       type='string', list='onecomma', scope={'global'},
       deny_duplicates=true,
       vim=true,
@@ -143,6 +156,7 @@ return {
     },
     {
       full_name='backup', abbreviation='bk',
+      short_desc=N_("keep backup file after overwriting a file"),
       type='bool', scope={'global'},
       vi_def=true,
       vim=true,
@@ -151,6 +165,7 @@ return {
     },
     {
       full_name='backupcopy', abbreviation='bkc',
+      short_desc=N_("make backup as a copy, don't rename the file"),
       type='string', list='onecomma', scope={'global', 'buffer'},
       deny_duplicates=true,
       vim=true,
@@ -163,6 +178,7 @@ return {
     },
     {
       full_name='backupdir', abbreviation='bdir',
+      short_desc=N_("list of directories for the backup file"),
       type='string', list='onecomma', scope={'global'},
       deny_duplicates=true,
       secure=true,
@@ -173,6 +189,7 @@ return {
     },
     {
       full_name='backupext', abbreviation='bex',
+      short_desc=N_("extension used for the backup file"),
       type='string', scope={'global'},
       normal_fname_chars=true,
       vi_def=true,
@@ -181,6 +198,7 @@ return {
     },
     {
       full_name='backupskip', abbreviation='bsk',
+      short_desc=N_("no backup for files that match these patterns"),
       type='string', list='onecomma', scope={'global'},
       deny_duplicates=true,
       vi_def=true,
@@ -189,6 +207,7 @@ return {
     },
     {
       full_name='belloff', abbreviation='bo',
+      short_desc=N_("do not ring the bell for these reasons"),
       type='string', list='comma', scope={'global'},
       deny_duplicates=true,
       vi_def=true,
@@ -197,6 +216,7 @@ return {
     },
     {
       full_name='binary', abbreviation='bin',
+      short_desc=N_("read/write/edit file in binary mode"),
       type='bool', scope={'buffer'},
       vi_def=true,
       redraw={'statuslines'},
@@ -205,6 +225,7 @@ return {
     },
     {
       full_name='bomb',
+      short_desc=N_("a Byte Order Mark to the file"),
       type='bool', scope={'buffer'},
       no_mkrc=true,
       vi_def=true,
@@ -214,6 +235,7 @@ return {
     },
     {
       full_name='breakat', abbreviation='brk',
+      short_desc=N_("characters that may cause a line break"),
       type='string', list='flags', scope={'global'},
       vi_def=true,
       redraw={'all_windows'},
@@ -222,6 +244,7 @@ return {
     },
     {
       full_name='breakindent', abbreviation='bri',
+      short_desc=N_("wrapped line repeats indent"),
       type='bool', scope={'window'},
       vi_def=true,
       vim=true,
@@ -230,6 +253,7 @@ return {
     },
     {
       full_name='breakindentopt', abbreviation='briopt',
+      short_desc=N_("settings for 'breakindent'"),
       type='string', list='onecomma', scope={'window'},
       deny_duplicates=true,
       vi_def=true,
@@ -239,12 +263,14 @@ return {
     },
     {
       full_name='browsedir', abbreviation='bsdir',
+      short_desc=N_("which directory to start browsing in"),
       type='string', scope={'global'},
       vi_def=true,
       enable_if=false,
     },
     {
       full_name='bufhidden', abbreviation='bh',
+      short_desc=N_("what to do when buffer is no longer in window"),
       type='string', scope={'buffer'},
       noglob=true,
       vi_def=true,
@@ -254,6 +280,7 @@ return {
     },
     {
       full_name='buflisted', abbreviation='bl',
+      short_desc=N_("whether the buffer shows up in the buffer list"),
       type='bool', scope={'buffer'},
       noglob=true,
       vi_def=true,
@@ -262,6 +289,7 @@ return {
     },
     {
       full_name='buftype', abbreviation='bt',
+      short_desc=N_("special type of buffer"),
       type='string', scope={'buffer'},
       noglob=true,
       vi_def=true,
@@ -271,6 +299,7 @@ return {
     },
     {
       full_name='casemap', abbreviation='cmp',
+      short_desc=N_("specifies how case of letters is changed"),
       type='string', list='onecomma', scope={'global'},
       deny_duplicates=true,
       vi_def=true,
@@ -279,6 +308,7 @@ return {
     },
     {
       full_name='cdpath', abbreviation='cd',
+      short_desc=N_("list of directories searched with \":cd\""),
       type='string', list='comma', scope={'global'},
       deny_duplicates=true,
       vi_def=true,
@@ -289,12 +319,14 @@ return {
     },
     {
       full_name='cedit',
+      short_desc=N_("used to open the command-line window"),
       type='string', scope={'global'},
       varname='p_cedit',
       defaults={if_true={vi="", vim=macros('CTRL_F_STR')}}
     },
     {
       full_name='channel',
+      short_desc=N_("Channel connected to the buffer"),
       type='number', scope={'buffer'},
       no_mkrc=true,
       nodefault=true,
@@ -303,6 +335,7 @@ return {
     },
     {
       full_name='charconvert', abbreviation='ccv',
+      short_desc=N_("expression for character encoding conversion"),
       type='string', scope={'global'},
       secure=true,
       vi_def=true,
@@ -311,6 +344,7 @@ return {
     },
     {
       full_name='cindent', abbreviation='cin',
+      short_desc=N_("do C program indenting"),
       type='bool', scope={'buffer'},
       vi_def=true,
       vim=true,
@@ -319,6 +353,7 @@ return {
     },
     {
       full_name='cinkeys', abbreviation='cink',
+      short_desc=N_("keys that trigger indent when 'cindent' is set"),
       type='string', list='onecomma', scope={'buffer'},
       deny_duplicates=true,
       vi_def=true,
@@ -328,6 +363,7 @@ return {
     },
     {
       full_name='cinoptions', abbreviation='cino',
+      short_desc=N_("how to do indenting when 'cindent' is set"),
       type='string', list='onecomma', scope={'buffer'},
       deny_duplicates=true,
       vi_def=true,
@@ -337,6 +373,7 @@ return {
     },
     {
       full_name='cinwords', abbreviation='cinw',
+      short_desc=N_("words where 'si' and 'cin' add an indent"),
       type='string', list='onecomma', scope={'buffer'},
       deny_duplicates=true,
       vi_def=true,
@@ -346,6 +383,7 @@ return {
     },
     {
       full_name='clipboard', abbreviation='cb',
+      short_desc=N_("use the clipboard as the unnamed register"),
       type='string', list='onecomma', scope={'global'},
       deny_duplicates=true,
       vi_def=true,
@@ -354,6 +392,7 @@ return {
     },
     {
       full_name='cmdheight', abbreviation='ch',
+      short_desc=N_("number of lines to use for the command-line"),
       type='number', scope={'global'},
       vi_def=true,
       redraw={'all_windows'},
@@ -362,6 +401,7 @@ return {
     },
     {
       full_name='cmdwinheight', abbreviation='cwh',
+      short_desc=N_("height of the command-line window"),
       type='number', scope={'global'},
       vi_def=true,
       varname='p_cwh',
@@ -369,6 +409,7 @@ return {
     },
     {
       full_name='colorcolumn', abbreviation='cc',
+      short_desc=N_("columns to highlight"),
       type='string', list='onecomma', scope={'window'},
       deny_duplicates=true,
       vi_def=true,
@@ -377,6 +418,7 @@ return {
     },
     {
       full_name='columns', abbreviation='co',
+      short_desc=N_("number of columns in the display"),
       type='number', scope={'global'},
       no_mkrc=true,
       vi_def=true,
@@ -386,6 +428,7 @@ return {
     },
     {
       full_name='comments', abbreviation='com',
+      short_desc=N_("patterns that can start a comment line"),
       type='string', list='onecomma', scope={'buffer'},
       deny_duplicates=true,
       vi_def=true,
@@ -396,6 +439,7 @@ return {
     },
     {
       full_name='commentstring', abbreviation='cms',
+      short_desc=N_("template for comments; used for fold marker"),
       type='string', scope={'buffer'},
       vi_def=true,
       alloced=true,
@@ -405,6 +449,7 @@ return {
     },
     {
       full_name='compatible', abbreviation='cp',
+	  short_desc=N_("No description"),
       type='bool', scope={'global'},
       redraw={'all_windows'},
       varname='p_force_off',
@@ -414,6 +459,7 @@ return {
     },
     {
       full_name='complete', abbreviation='cpt',
+      short_desc=N_("specify how Insert mode completion works"),
       type='string', list='onecomma', scope={'buffer'},
       deny_duplicates=true,
       alloced=true,
@@ -422,6 +468,7 @@ return {
     },
     {
       full_name='concealcursor', abbreviation='cocu',
+      short_desc=N_("whether concealable text is hidden in cursor line"),
       type='string', scope={'window'},
       vi_def=true,
       alloced=true,
@@ -430,6 +477,7 @@ return {
     },
     {
       full_name='conceallevel', abbreviation='cole',
+      short_desc=N_("whether concealable text is shown or hidden"),
       type='number', scope={'window'},
       vi_def=true,
       redraw={'current_window'},
@@ -437,6 +485,7 @@ return {
     },
     {
       full_name='completefunc', abbreviation='cfu',
+      short_desc=N_("function to be used for Insert mode completion"),
       type='string', scope={'buffer'},
       secure=true,
       vi_def=true,
@@ -446,6 +495,7 @@ return {
     },
     {
       full_name='completeopt', abbreviation='cot',
+      short_desc=N_("options for Insert mode completion"),
       type='string', list='onecomma', scope={'global'},
       deny_duplicates=true,
       vi_def=true,
@@ -463,6 +513,7 @@ return {
     },
     {
       full_name='confirm', abbreviation='cf',
+      short_desc=N_("ask what to do about unsaved/read-only files"),
       type='bool', scope={'global'},
       vi_def=true,
       varname='p_confirm',
@@ -470,6 +521,7 @@ return {
     },
     {
       full_name='copyindent', abbreviation='ci',
+      short_desc=N_("make 'autoindent' use existing indent structure"),
       type='bool', scope={'buffer'},
       vi_def=true,
       vim=true,
@@ -478,6 +530,7 @@ return {
     },
     {
       full_name='cpoptions', abbreviation='cpo',
+      short_desc=N_("flags for Vi-compatible behavior"),
       type='string', list='flags', scope={'global'},
       vim=true,
       redraw={'all_windows'},
@@ -486,6 +539,7 @@ return {
     },
     {
       full_name='cscopepathcomp', abbreviation='cspc',
+      short_desc=N_("how many components of the path to show"),
       type='number', scope={'global'},
       vi_def=true,
       vim=true,
@@ -494,6 +548,7 @@ return {
     },
     {
       full_name='cscopeprg', abbreviation='csprg',
+      short_desc=N_("command to execute cscope"),
       type='string', scope={'global'},
       secure=true,
       vi_def=true,
@@ -503,6 +558,7 @@ return {
     },
     {
       full_name='cscopequickfix', abbreviation='csqf',
+      short_desc=N_("use quickfix window for cscope results"),
       type='string', list='onecomma', scope={'global'},
       deny_duplicates=true,
       vi_def=true,
@@ -511,6 +567,7 @@ return {
     },
     {
       full_name='cscoperelative', abbreviation='csre',
+      short_desc=N_("Use cscope.out path basename as prefix"),
       type='bool', scope={'global'},
       vi_def=true,
       vim=true,
@@ -519,6 +576,7 @@ return {
     },
     {
       full_name='cscopetag', abbreviation='cst',
+      short_desc=N_("use cscope for tag commands"),
       type='bool', scope={'global'},
       vi_def=true,
       vim=true,
@@ -527,6 +585,7 @@ return {
     },
     {
       full_name='cscopetagorder', abbreviation='csto',
+      short_desc=N_("determines \":cstag\" search order"),
       type='number', scope={'global'},
       vi_def=true,
       vim=true,
@@ -535,6 +594,7 @@ return {
     },
     {
       full_name='cscopeverbose', abbreviation='csverb',
+      short_desc=N_("give messages when adding a cscope database"),
       type='bool', scope={'global'},
       vi_def=true,
       vim=true,
@@ -543,6 +603,7 @@ return {
     },
     {
       full_name='cursorbind', abbreviation='crb',
+      short_desc=N_("move cursor in window as it moves in other windows"),
       type='bool', scope={'window'},
       vi_def=true,
       pv_name='p_crbind',
@@ -550,6 +611,7 @@ return {
     },
     {
       full_name='cursorcolumn', abbreviation='cuc',
+      short_desc=N_("highlight the screen column of the cursor"),
       type='bool', scope={'window'},
       vi_def=true,
       redraw={'current_window_only'},
@@ -557,6 +619,7 @@ return {
     },
     {
       full_name='cursorline', abbreviation='cul',
+      short_desc=N_("highlight the screen line of the cursor"),
       type='bool', scope={'window'},
       vi_def=true,
       redraw={'current_window_only'},
@@ -564,6 +627,7 @@ return {
     },
     {
       full_name='debug',
+      short_desc=N_("to \"msg\" to see all error messages"),
       type='string', scope={'global'},
       vi_def=true,
       varname='p_debug',
@@ -571,6 +635,7 @@ return {
     },
     {
       full_name='define', abbreviation='def',
+      short_desc=N_("pattern to be used to find a macro definition"),
       type='string', scope={'global', 'buffer'},
       vi_def=true,
       alloced=true,
@@ -580,6 +645,7 @@ return {
     },
     {
       full_name='delcombine', abbreviation='deco',
+      short_desc=N_("delete combining characters on their own"),
       type='bool', scope={'global'},
       vi_def=true,
       vim=true,
@@ -588,6 +654,7 @@ return {
     },
     {
       full_name='dictionary', abbreviation='dict',
+      short_desc=N_("list of file names used for keyword completion"),
       type='string', list='onecomma', scope={'global', 'buffer'},
       deny_duplicates=true,
       normal_dname_chars=true,
@@ -598,6 +665,7 @@ return {
     },
     {
       full_name='diff',
+      short_desc=N_("diff mode for the current window"),
       type='bool', scope={'window'},
       noglob=true,
       vi_def=true,
@@ -606,6 +674,7 @@ return {
     },
     {
       full_name='diffexpr', abbreviation='dex',
+      short_desc=N_("expression used to obtain a diff file"),
       type='string', scope={'global'},
       secure=true,
       vi_def=true,
@@ -615,6 +684,7 @@ return {
     },
     {
       full_name='diffopt', abbreviation='dip',
+      short_desc=N_("options for using diff mode"),
       type='string', list='onecomma', scope={'global'},
       deny_duplicates=true,
       vi_def=true,
@@ -625,6 +695,7 @@ return {
     },
     {
       full_name='digraph', abbreviation='dg',
+      short_desc=N_("enable the entering of digraphs in Insert mode"),
       type='bool', scope={'global'},
       vi_def=true,
       vim=true,
@@ -633,6 +704,7 @@ return {
     },
     {
       full_name='directory', abbreviation='dir',
+      short_desc=N_("list of directory names for the swap file"),
       type='string', list='onecomma', scope={'global'},
       deny_duplicates=true,
       secure=true,
@@ -643,6 +715,7 @@ return {
     },
     {
       full_name='display', abbreviation='dy',
+      short_desc=N_("list of flags for how to display text"),
       type='string', list='onecomma', scope={'global'},
       deny_duplicates=true,
       vim=true,
@@ -652,6 +725,7 @@ return {
     },
     {
       full_name='eadirection', abbreviation='ead',
+      short_desc=N_("in which direction 'equalalways' works"),
       type='string', scope={'global'},
       vi_def=true,
       varname='p_ead',
@@ -659,6 +733,7 @@ return {
     },
     {
       full_name='edcompatible', abbreviation='ed',
+	  short_desc=N_("No description"),
       type='bool', scope={'global'},
       vi_def=true,
       varname='p_force_off',
@@ -666,6 +741,7 @@ return {
     },
     {
       full_name='emoji', abbreviation='emo',
+	  short_desc=N_("No description"),
       type='bool', scope={'global'},
       vi_def=true,
       redraw={'all_windows', 'ui_option'},
@@ -674,6 +750,7 @@ return {
     },
     {
       full_name='encoding', abbreviation='enc',
+      short_desc=N_("encoding used internally"),
       type='string', scope={'global'},
       deny_in_modelines=true,
       vi_def=true,
@@ -682,6 +759,7 @@ return {
     },
     {
       full_name='endofline', abbreviation='eol',
+      short_desc=N_("write <EOL> for last line in file"),
       type='bool', scope={'buffer'},
       no_mkrc=true,
       vi_def=true,
@@ -691,6 +769,7 @@ return {
     },
     {
       full_name='equalalways', abbreviation='ea',
+      short_desc=N_("windows are automatically made the same size"),
       type='bool', scope={'global'},
       vi_def=true,
       redraw={'all_windows'},
@@ -699,6 +778,7 @@ return {
     },
     {
       full_name='equalprg', abbreviation='ep',
+      short_desc=N_("external program to use for \"=\" command"),
       type='string', scope={'global', 'buffer'},
       secure=true,
       vi_def=true,
@@ -708,6 +788,7 @@ return {
     },
     {
       full_name='errorbells', abbreviation='eb',
+      short_desc=N_("ring the bell for error messages"),
       type='bool', scope={'global'},
       vi_def=true,
       varname='p_eb',
@@ -715,6 +796,7 @@ return {
     },
     {
       full_name='errorfile', abbreviation='ef',
+      short_desc=N_("name of the errorfile for the QuickFix mode"),
       type='string', scope={'global'},
       secure=true,
       vi_def=true,
@@ -724,6 +806,7 @@ return {
     },
     {
       full_name='errorformat', abbreviation='efm',
+      short_desc=N_("description of the lines in the error file"),
       type='string', list='onecomma', scope={'global', 'buffer'},
       deny_duplicates=true,
       vi_def=true,
@@ -732,6 +815,7 @@ return {
     },
     {
       full_name='eventignore', abbreviation='ei',
+      short_desc=N_("autocommand events that are ignored"),
       type='string', list='onecomma', scope={'global'},
       deny_duplicates=true,
       vi_def=true,
@@ -740,6 +824,7 @@ return {
     },
     {
       full_name='expandtab', abbreviation='et',
+      short_desc=N_("use spaces when <Tab> is inserted"),
       type='bool', scope={'buffer'},
       vi_def=true,
       vim=true,
@@ -748,6 +833,7 @@ return {
     },
     {
       full_name='exrc', abbreviation='ex',
+      short_desc=N_("read .nvimrc and .exrc in the current directory"),
       type='bool', scope={'global'},
       secure=true,
       vi_def=true,
@@ -756,6 +842,7 @@ return {
     },
     {
       full_name='fileencoding', abbreviation='fenc',
+      short_desc=N_("file encoding for multi-byte text"),
       type='string', scope={'buffer'},
       no_mkrc=true,
       vi_def=true,
@@ -766,6 +853,7 @@ return {
     },
     {
       full_name='fileencodings', abbreviation='fencs',
+      short_desc=N_("automatically detected character encodings"),
       type='string', list='onecomma', scope={'global'},
       deny_duplicates=true,
       vi_def=true,
@@ -774,6 +862,7 @@ return {
     },
     {
       full_name='fileformat', abbreviation='ff',
+      short_desc=N_("file format used for file I/O"),
       type='string', scope={'buffer'},
       no_mkrc=true,
       vi_def=true,
@@ -784,6 +873,7 @@ return {
     },
     {
       full_name='fileformats', abbreviation='ffs',
+      short_desc=N_("automatically detected values for 'fileformat'"),
       type='string', list='onecomma', scope={'global'},
       deny_duplicates=true,
       vim=true,
@@ -792,6 +882,7 @@ return {
     },
     {
       full_name='fileignorecase', abbreviation='fic',
+      short_desc=N_("ignore case when using file names"),
       type='bool', scope={'global'},
       vi_def=true,
       varname='p_fic',
@@ -803,6 +894,7 @@ return {
     },
     {
       full_name='filetype', abbreviation='ft',
+      short_desc=N_("type of file, used for autocommands"),
       type='string', scope={'buffer'},
       noglob=true,
       normal_fname_chars=true,
@@ -813,6 +905,7 @@ return {
     },
     {
       full_name='fillchars', abbreviation='fcs',
+      short_desc=N_("characters to use for displaying special items"),
       type='string', list='onecomma', scope={'global', 'window'},
       deny_duplicates=true,
       vi_def=true,
@@ -823,6 +916,7 @@ return {
     },
     {
       full_name='fixendofline', abbreviation='fixeol',
+      short_desc=N_("make sure last line in file has <EOL>"),
       type='bool', scope={'buffer'},
       vi_def=true,
       redraw={'statuslines'},
@@ -831,6 +925,7 @@ return {
     },
     {
       full_name='foldclose', abbreviation='fcl',
+      short_desc=N_("close a fold when the cursor leaves it"),
       type='string', list='onecomma', scope={'global'},
       deny_duplicates=true,
       vi_def=true,
@@ -840,6 +935,7 @@ return {
     },
     {
       full_name='foldcolumn', abbreviation='fdc',
+      short_desc=N_("width of the column used to indicate folds"),
       type='string', scope={'window'},
       vi_def=true,
       alloced=true,
@@ -848,6 +944,7 @@ return {
     },
     {
       full_name='foldenable', abbreviation='fen',
+      short_desc=N_("set to display all folds open"),
       type='bool', scope={'window'},
       vi_def=true,
       redraw={'current_window'},
@@ -855,6 +952,7 @@ return {
     },
     {
       full_name='foldexpr', abbreviation='fde',
+      short_desc=N_("expression used when 'foldmethod' is \"expr\""),
       type='string', scope={'window'},
       vi_def=true,
       vim=true,
@@ -865,6 +963,7 @@ return {
     },
     {
       full_name='foldignore', abbreviation='fdi',
+      short_desc=N_("ignore lines when 'foldmethod' is \"indent\""),
       type='string', scope={'window'},
       vi_def=true,
       vim=true,
@@ -874,6 +973,7 @@ return {
     },
     {
       full_name='foldlevel', abbreviation='fdl',
+      short_desc=N_("close folds with a level higher than this"),
       type='number', scope={'window'},
       vi_def=true,
       redraw={'current_window'},
@@ -881,6 +981,7 @@ return {
     },
     {
       full_name='foldlevelstart', abbreviation='fdls',
+      short_desc=N_("'foldlevel' when starting to edit a file"),
       type='number', scope={'global'},
       vi_def=true,
       redraw={'curswant'},
@@ -889,6 +990,7 @@ return {
     },
     {
       full_name='foldmarker', abbreviation='fmr',
+      short_desc=N_("markers used when 'foldmethod' is \"marker\""),
       type='string', list='onecomma', scope={'window'},
       deny_duplicates=true,
       vi_def=true,
@@ -899,6 +1001,7 @@ return {
     },
     {
       full_name='foldmethod', abbreviation='fdm',
+      short_desc=N_("folding type"),
       type='string', scope={'window'},
       vi_def=true,
       vim=true,
@@ -908,6 +1011,7 @@ return {
     },
     {
       full_name='foldminlines', abbreviation='fml',
+      short_desc=N_("minimum number of lines for a fold to be closed"),
       type='number', scope={'window'},
       vi_def=true,
       redraw={'current_window'},
@@ -915,6 +1019,7 @@ return {
     },
     {
       full_name='foldnestmax', abbreviation='fdn',
+      short_desc=N_("maximum fold depth"),
       type='number', scope={'window'},
       vi_def=true,
       redraw={'current_window'},
@@ -922,6 +1027,7 @@ return {
     },
     {
       full_name='foldopen', abbreviation='fdo',
+      short_desc=N_("for which commands a fold will be opened"),
       type='string', list='onecomma', scope={'global'},
       deny_duplicates=true,
       vi_def=true,
@@ -931,6 +1037,7 @@ return {
     },
     {
       full_name='foldtext', abbreviation='fdt',
+      short_desc=N_("expression used to display for a closed fold"),
       type='string', scope={'window'},
       vi_def=true,
       vim=true,
@@ -941,6 +1048,7 @@ return {
     },
     {
       full_name='formatexpr', abbreviation='fex',
+      short_desc=N_("expression used with \"gq\" command"),
       type='string', scope={'buffer'},
       vi_def=true,
       vim=true,
@@ -951,6 +1059,7 @@ return {
     },
     {
       full_name='formatoptions', abbreviation='fo',
+      short_desc=N_("how automatic formatting is to be done"),
       type='string', list='flags', scope={'buffer'},
       vim=true,
       alloced=true,
@@ -959,6 +1068,7 @@ return {
     },
     {
       full_name='formatlistpat', abbreviation='flp',
+      short_desc=N_("pattern used to recognize a list header"),
       type='string', scope={'buffer'},
       vi_def=true,
       alloced=true,
@@ -967,6 +1077,7 @@ return {
     },
     {
       full_name='formatprg', abbreviation='fp',
+      short_desc=N_("name of external program used with \"gq\" command"),
       type='string', scope={'global', 'buffer'},
       secure=true,
       vi_def=true,
@@ -976,6 +1087,7 @@ return {
     },
     {
       full_name='fsync', abbreviation='fs',
+      short_desc=N_("whether to invoke fsync() after file write"),
       type='bool', scope={'global'},
       secure=true,
       vi_def=true,
@@ -984,6 +1096,7 @@ return {
     },
     {
       full_name='gdefault', abbreviation='gd',
+      short_desc=N_("the \":substitute\" flag 'g' is default on"),
       type='bool', scope={'global'},
       vi_def=true,
       vim=true,
@@ -992,6 +1105,7 @@ return {
     },
     {
       full_name='grepformat', abbreviation='gfm',
+      short_desc=N_("format of 'grepprg' output"),
       type='string', list='onecomma', scope={'global'},
       deny_duplicates=true,
       vi_def=true,
@@ -1000,6 +1114,7 @@ return {
     },
     {
       full_name='grepprg', abbreviation='gp',
+      short_desc=N_("program to use for \":grep\""),
       type='string', scope={'global', 'buffer'},
       secure=true,
       vi_def=true,
@@ -1015,6 +1130,7 @@ return {
     },
     {
       full_name='guicursor', abbreviation='gcr',
+      short_desc=N_("GUI: settings for cursor shape and blinking"),
       type='string', list='onecomma', scope={'global'},
       deny_duplicates=true,
       vi_def=true,
@@ -1023,6 +1139,7 @@ return {
     },
     {
       full_name='guifont', abbreviation='gfn',
+      short_desc=N_("GUI: Name(s) of font(s) to be used"),
       type='string', list='onecomma', scope={'global'},
       deny_duplicates=true,
       vi_def=true,
@@ -1032,6 +1149,7 @@ return {
     },
     {
       full_name='guifontwide', abbreviation='gfw',
+      short_desc=N_("list of font names for double-wide characters"),
       type='string', list='onecomma', scope={'global'},
       deny_duplicates=true,
       vi_def=true,
@@ -1041,6 +1159,7 @@ return {
     },
     {
       full_name='guioptions', abbreviation='go',
+      short_desc=N_("GUI: Which components and options are used"),
       type='string', list='flags', scope={'global'},
       vi_def=true,
       redraw={'all_windows'},
@@ -1048,6 +1167,7 @@ return {
     },
     {
       full_name='guitablabel', abbreviation='gtl',
+      short_desc=N_("GUI: custom label for a tab page"),
       type='string', scope={'global'},
       vi_def=true,
       modelineexpr=true,
@@ -1056,6 +1176,7 @@ return {
     },
     {
       full_name='guitabtooltip', abbreviation='gtt',
+      short_desc=N_("GUI: custom tooltip for a tab page"),
       type='string', scope={'global'},
       vi_def=true,
       redraw={'current_window'},
@@ -1063,6 +1184,7 @@ return {
     },
     {
       full_name='helpfile', abbreviation='hf',
+      short_desc=N_("full path name of the main help file"),
       type='string', scope={'global'},
       secure=true,
       vi_def=true,
@@ -1072,6 +1194,7 @@ return {
     },
     {
       full_name='helpheight', abbreviation='hh',
+      short_desc=N_("minimum height of a new help window"),
       type='number', scope={'global'},
       vi_def=true,
       varname='p_hh',
@@ -1079,6 +1202,7 @@ return {
     },
     {
       full_name='helplang', abbreviation='hlg',
+      short_desc=N_("preferred help languages"),
       type='string', list='onecomma', scope={'global'},
       deny_duplicates=true,
       vi_def=true,
@@ -1087,6 +1211,7 @@ return {
     },
     {
       full_name='hidden', abbreviation='hid',
+      short_desc=N_("don't unload buffer when it is |abandon|ed"),
       type='bool', scope={'global'},
       vi_def=true,
       varname='p_hid',
@@ -1094,6 +1219,7 @@ return {
     },
     {
       full_name='highlight', abbreviation='hl',
+      short_desc=N_("sets highlighting mode for various occasions"),
       type='string', list='onecomma', scope={'global'},
       deny_duplicates=true,
       vi_def=true,
@@ -1102,6 +1228,7 @@ return {
     },
     {
       full_name='history', abbreviation='hi',
+      short_desc=N_("number of command-lines that are remembered"),
       type='number', scope={'global'},
       vim=true,
       varname='p_hi',
@@ -1109,6 +1236,7 @@ return {
     },
     {
       full_name='hkmap', abbreviation='hk',
+      short_desc=N_("Hebrew keyboard mapping"),
       type='bool', scope={'global'},
       vi_def=true,
       vim=true,
@@ -1117,6 +1245,7 @@ return {
     },
     {
       full_name='hkmapp', abbreviation='hkp',
+      short_desc=N_("phonetic Hebrew keyboard mapping"),
       type='bool', scope={'global'},
       vi_def=true,
       vim=true,
@@ -1125,6 +1254,7 @@ return {
     },
     {
       full_name='hlsearch', abbreviation='hls',
+      short_desc=N_("highlight matches with last search pattern"),
       type='bool', scope={'global'},
       vim=true,
       redraw={'all_windows'},
@@ -1133,6 +1263,7 @@ return {
     },
     {
       full_name='icon',
+      short_desc=N_("Vim set the text of the window icon"),
       type='bool', scope={'global'},
       vi_def=true,
       varname='p_icon',
@@ -1140,6 +1271,7 @@ return {
     },
     {
       full_name='iconstring',
+      short_desc=N_("to use for the Vim icon text"),
       type='string', scope={'global'},
       vi_def=true,
       modelineexpr=true,
@@ -1148,6 +1280,7 @@ return {
     },
     {
       full_name='ignorecase', abbreviation='ic',
+      short_desc=N_("ignore case in search patterns"),
       type='bool', scope={'global'},
       vi_def=true,
       varname='p_ic',
@@ -1155,6 +1288,7 @@ return {
     },
     {
       full_name='imcmdline', abbreviation='imc',
+      short_desc=N_("use IM when starting to edit a command line"),
       type='bool', scope={'global'},
       vi_def=true,
       enable_if=false,
@@ -1162,6 +1296,7 @@ return {
     },
     {
       full_name='imdisable', abbreviation='imd',
+      short_desc=N_("do not use the IM in any mode"),
       type='bool', scope={'global'},
       vi_def=