To: vim_dev@googlegroups.com Subject: Patch 8.2.1639 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.1639 Problem: Options window cannot be translated. Solution: Get the translation for "local to" texts once and use them in many places. Fix that 'whichwrap' is not a local option. (issue #6800) Files: runtime/optwin.vim *** ../vim-8.2.1638/runtime/optwin.vim 2020-08-30 15:49:12.154736331 +0200 --- runtime/optwin.vim 2020-09-09 12:54:57.562709408 +0200 *************** *** 69,78 **** endif endfun " find the window in which the option applies " returns 0 for global option, 1 for local option, -1 for error fun! Find(lnum) ! if getline(a:lnum - 1) =~ "(local to" let local = 1 let thiswin = winnr() wincmd p --- 69,82 ---- endif endfun + let s:local_to_window = gettext('(local to window)') + let s:local_to_buffer = gettext('(local to buffer)') + " find the window in which the option applies " returns 0 for global option, 1 for local option, -1 for error fun! Find(lnum) ! let line = getline(a:lnum - 1) ! if line =~ s:local_to_window || line =~ s:local_to_buffer let local = 1 let thiswin = winnr() wincmd p *************** *** 235,242 **** call Header("moving around, searching and patterns") call append("$", "whichwrap\tlist of flags specifying which commands wrap to another line") ! call append("$", "\t(local to window)") ! call OptionL("ww") call append("$", "startofline\tmany jump commands move the cursor to the first non-blank") call append("$", "\tcharacter of a line") call BinOptionG("sol", &sol) --- 239,245 ---- call Header("moving around, searching and patterns") call append("$", "whichwrap\tlist of flags specifying which commands wrap to another line") ! call OptionG("ww") call append("$", "startofline\tmany jump commands move the cursor to the first non-blank") call append("$", "\tcharacter of a line") call BinOptionG("sol", &sol) *************** *** 274,283 **** call OptionG("def", &def) if has("find_in_path") call append("$", "include\tpattern for an include-file line") ! call append("$", "\t(local to buffer)") call OptionL("inc") call append("$", "includeexpr\texpression used to transform an include line to a file name") ! call append("$", "\t(local to buffer)") call OptionL("inex") endif --- 277,286 ---- call OptionG("def", &def) if has("find_in_path") call append("$", "include\tpattern for an include-file line") ! call append("$", "\t" .. s:local_to_buffer) call OptionL("inc") call append("$", "includeexpr\texpression used to transform an include line to a file name") ! call append("$", "\t" .. s:local_to_buffer) call OptionL("inex") endif *************** *** 302,308 **** call BinOptionG("sft", &sft) if has("eval") call append("$", "tagfunc\ta function to be used to perform tag searches") ! call append("$", "\t(local to buffer)") call OptionL("tfu") endif if has("cscope") --- 305,311 ---- call BinOptionG("sft", &sft) if has("eval") call append("$", "tagfunc\ta function to be used to perform tag searches") ! call append("$", "\t" .. s:local_to_buffer) call OptionL("tfu") endif if has("cscope") *************** *** 325,345 **** call Header("displaying text") call append("$", "scroll\tnumber of lines to scroll for CTRL-U and CTRL-D") ! call append("$", "\t(local to window)") call OptionL("scr") call append("$", "scrolloff\tnumber of screen lines to show around the cursor") call append("$", " \tset so=" . &so) call append("$", "wrap\tlong lines wrap") ! call append("$", "\t(local to window)") call BinOptionL("wrap") call append("$", "linebreak\twrap long lines at a character in 'breakat'") ! call append("$", "\t(local to window)") call BinOptionL("lbr") call append("$", "breakindent\tpreserve indentation in wrapped text") ! call append("$", "\t(local to window)") call BinOptionL("bri") call append("$", "breakindentopt\tadjust breakindent behaviour") ! call append("$", "\t(local to window)") call OptionL("briopt") call append("$", "breakat\twhich characters might cause a line break") call OptionG("brk", &brk) --- 328,348 ---- call Header("displaying text") call append("$", "scroll\tnumber of lines to scroll for CTRL-U and CTRL-D") ! call append("$", "\t" .. s:local_to_window) call OptionL("scr") call append("$", "scrolloff\tnumber of screen lines to show around the cursor") call append("$", " \tset so=" . &so) call append("$", "wrap\tlong lines wrap") ! call append("$", "\t" .. s:local_to_window) call BinOptionL("wrap") call append("$", "linebreak\twrap long lines at a character in 'breakat'") ! call append("$", "\t" .. s:local_to_window) call BinOptionL("lbr") call append("$", "breakindent\tpreserve indentation in wrapped text") ! call append("$", "\t" .. s:local_to_window) call BinOptionL("bri") call append("$", "breakindentopt\tadjust breakindent behaviour") ! call append("$", "\t" .. s:local_to_window) call OptionL("briopt") call append("$", "breakat\twhich characters might cause a line break") call OptionG("brk", &brk) *************** *** 372,398 **** call append("$", "\t(for debugging)") call append("$", " \tset wd=" . &wd) call append("$", "list\tshow as ^I and end-of-line as $") ! call append("$", "\t(local to window)") call BinOptionL("list") call append("$", "listchars\tlist of strings used for list mode") call OptionG("lcs", &lcs) call append("$", "number\tshow the line number for each line") ! call append("$", "\t(local to window)") call BinOptionL("nu") call append("$", "relativenumber\tshow the relative line number for each line") ! call append("$", "\t(local to window)") call BinOptionL("rnu") if has("linebreak") call append("$", "numberwidth\tnumber of columns to use for the line number") ! call append("$", "\t(local to window)") call OptionL("nuw") endif if has("conceal") call append("$", "conceallevel\tcontrols whether concealable text is hidden") ! call append("$", "\t(local to window)") call OptionL("cole") call append("$", "concealcursor\tmodes in which text in the cursor line can be concealed") ! call append("$", "\t(local to window)") call OptionL("cocu") endif --- 375,401 ---- call append("$", "\t(for debugging)") call append("$", " \tset wd=" . &wd) call append("$", "list\tshow as ^I and end-of-line as $") ! call append("$", "\t" .. s:local_to_window) call BinOptionL("list") call append("$", "listchars\tlist of strings used for list mode") call OptionG("lcs", &lcs) call append("$", "number\tshow the line number for each line") ! call append("$", "\t" .. s:local_to_window) call BinOptionL("nu") call append("$", "relativenumber\tshow the relative line number for each line") ! call append("$", "\t" .. s:local_to_window) call BinOptionL("rnu") if has("linebreak") call append("$", "numberwidth\tnumber of columns to use for the line number") ! call append("$", "\t" .. s:local_to_window) call OptionL("nuw") endif if has("conceal") call append("$", "conceallevel\tcontrols whether concealable text is hidden") ! call append("$", "\t" .. s:local_to_window) call OptionL("cole") call append("$", "concealcursor\tmodes in which text in the cursor line can be concealed") ! call append("$", "\t" .. s:local_to_window) call OptionL("cocu") endif *************** *** 401,414 **** call append("$", "background\t\"dark\" or \"light\"; the background color brightness") call OptionG("bg", &bg) call append("$", "filetype\ttype of file; triggers the FileType event when set") ! call append("$", "\t(local to buffer)") call OptionL("ft") if has("syntax") call append("$", "syntax\tname of syntax highlighting used") ! call append("$", "\t(local to buffer)") call OptionL("syn") call append("$", "synmaxcol\tmaximum column to look for syntax items") ! call append("$", "\t(local to buffer)") call OptionL("smc") endif call append("$", "highlight\twhich highlighting to use for various occasions") --- 404,417 ---- call append("$", "background\t\"dark\" or \"light\"; the background color brightness") call OptionG("bg", &bg) call append("$", "filetype\ttype of file; triggers the FileType event when set") ! call append("$", "\t" .. s:local_to_buffer) call OptionL("ft") if has("syntax") call append("$", "syntax\tname of syntax highlighting used") ! call append("$", "\t" .. s:local_to_buffer) call OptionL("syn") call append("$", "synmaxcol\tmaximum column to look for syntax items") ! call append("$", "\t" .. s:local_to_buffer) call OptionL("smc") endif call append("$", "highlight\twhich highlighting to use for various occasions") *************** *** 416,422 **** call append("$", "hlsearch\thighlight all matches for the last used search pattern") call BinOptionG("hls", &hls) call append("$", "wincolor\thighlight group to use for the window") ! call append("$", "\t(local to window)") call OptionL("wcr") if has("termguicolors") call append("$", "termguicolors\tuse GUI colors for the terminal") --- 419,425 ---- call append("$", "hlsearch\thighlight all matches for the last used search pattern") call BinOptionG("hls", &hls) call append("$", "wincolor\thighlight group to use for the window") ! call append("$", "\t" .. s:local_to_window) call OptionL("wcr") if has("termguicolors") call append("$", "termguicolors\tuse GUI colors for the terminal") *************** *** 424,454 **** endif if has("syntax") call append("$", "cursorcolumn\thighlight the screen column of the cursor") ! call append("$", "\t(local to window)") call BinOptionL("cuc") call append("$", "cursorline\thighlight the screen line of the cursor") ! call append("$", "\t(local to window)") call BinOptionL("cul") call append("$", "cursorlineopt\tspecifies which area 'cursorline' highlights") ! call append("$", "\t(local to window)") call OptionL("culopt") call append("$", "colorcolumn\tcolumns to highlight") ! call append("$", "\t(local to window)") call OptionL("cc") call append("$", "spell\thighlight spelling mistakes") ! call append("$", "\t(local to window)") call BinOptionL("spell") call append("$", "spelllang\tlist of accepted languages") ! call append("$", "\t(local to buffer)") call OptionL("spl") call append("$", "spellfile\tfile that \"zg\" adds good words to") ! call append("$", "\t(local to buffer)") call OptionL("spf") call append("$", "spellcapcheck\tpattern to locate the end of a sentence") ! call append("$", "\t(local to buffer)") call OptionL("spc") call append("$", "spelloptions\tflags to change how spell checking works") ! call append("$", "\t(local to buffer)") call OptionL("spo") call append("$", "spellsuggest\tmethods used to suggest corrections") call OptionG("sps", &sps) --- 427,457 ---- endif if has("syntax") call append("$", "cursorcolumn\thighlight the screen column of the cursor") ! call append("$", "\t" .. s:local_to_window) call BinOptionL("cuc") call append("$", "cursorline\thighlight the screen line of the cursor") ! call append("$", "\t" .. s:local_to_window) call BinOptionL("cul") call append("$", "cursorlineopt\tspecifies which area 'cursorline' highlights") ! call append("$", "\t" .. s:local_to_window) call OptionL("culopt") call append("$", "colorcolumn\tcolumns to highlight") ! call append("$", "\t" .. s:local_to_window) call OptionL("cc") call append("$", "spell\thighlight spelling mistakes") ! call append("$", "\t" .. s:local_to_window) call BinOptionL("spell") call append("$", "spelllang\tlist of accepted languages") ! call append("$", "\t" .. s:local_to_buffer) call OptionL("spl") call append("$", "spellfile\tfile that \"zg\" adds good words to") ! call append("$", "\t" .. s:local_to_buffer) call OptionL("spf") call append("$", "spellcapcheck\tpattern to locate the end of a sentence") ! call append("$", "\t" .. s:local_to_buffer) call OptionL("spc") call append("$", "spelloptions\tflags to change how spell checking works") ! call append("$", "\t" .. s:local_to_buffer) call OptionL("spo") call append("$", "spellsuggest\tmethods used to suggest corrections") call OptionG("sps", &sps) *************** *** 473,482 **** call append("$", "winminheight\tminimal number of lines used for any window") call append("$", " \tset wmh=" . &wmh) call append("$", "winfixheight\tkeep the height of the window") ! call append("$", "\t(local to window)") call BinOptionL("wfh") call append("$", "winfixwidth\tkeep the width of the window") ! call append("$", "\t(local to window)") call BinOptionL("wfw") call append("$", "winwidth\tminimal number of columns used for the current window") call append("$", " \tset wiw=" . &wiw) --- 476,485 ---- call append("$", "winminheight\tminimal number of lines used for any window") call append("$", " \tset wmh=" . &wmh) call append("$", "winfixheight\tkeep the height of the window") ! call append("$", "\t" .. s:local_to_window) call BinOptionL("wfh") call append("$", "winfixwidth\tkeep the width of the window") ! call append("$", "\t" .. s:local_to_window) call BinOptionL("wfw") call append("$", "winwidth\tminimal number of columns used for the current window") call append("$", " \tset wiw=" . &wiw) *************** *** 490,496 **** call append("$", "previewheight\tdefault height for the preview window") call append("$", " \tset pvh=" . &pvh) call append("$", "previewwindow\tidentifies the preview window") ! call append("$", "\t(local to window)") call BinOptionL("pvw") endif call append("$", "hidden\tdon't unload a buffer when no longer shown in a window") --- 493,499 ---- call append("$", "previewheight\tdefault height for the preview window") call append("$", " \tset pvh=" . &pvh) call append("$", "previewwindow\tidentifies the preview window") ! call append("$", "\t" .. s:local_to_window) call BinOptionL("pvw") endif call append("$", "hidden\tdon't unload a buffer when no longer shown in a window") *************** *** 503,524 **** call append("$", "splitright\ta new window is put right of the current one") call BinOptionG("spr", &spr) call append("$", "scrollbind\tthis window scrolls together with other bound windows") ! call append("$", "\t(local to window)") call BinOptionL("scb") call append("$", "scrollopt\t\"ver\", \"hor\" and/or \"jump\"; list of options for 'scrollbind'") call OptionG("sbo", &sbo) call append("$", "cursorbind\tthis window's cursor moves together with other bound windows") ! call append("$", "\t(local to window)") call BinOptionL("crb") if has("terminal") call append("$", "termwinsize\tsize of a terminal window") ! call append("$", "\t(local to window)") call OptionL("tws") call append("$", "termwinkey\tkey that precedes Vim commands in a terminal window") ! call append("$", "\t(local to window)") call OptionL("twk") call append("$", "termwinscroll\tmax number of lines to keep for scrollback in a terminal window") ! call append("$", "\t(local to window)") if has('win32') call append("$", "termwintype\ttype of pty to use for a terminal window") call OptionG("twt", &twt) --- 506,527 ---- call append("$", "splitright\ta new window is put right of the current one") call BinOptionG("spr", &spr) call append("$", "scrollbind\tthis window scrolls together with other bound windows") ! call append("$", "\t" .. s:local_to_window) call BinOptionL("scb") call append("$", "scrollopt\t\"ver\", \"hor\" and/or \"jump\"; list of options for 'scrollbind'") call OptionG("sbo", &sbo) call append("$", "cursorbind\tthis window's cursor moves together with other bound windows") ! call append("$", "\t" .. s:local_to_window) call BinOptionL("crb") if has("terminal") call append("$", "termwinsize\tsize of a terminal window") ! call append("$", "\t" .. s:local_to_window) call OptionL("tws") call append("$", "termwinkey\tkey that precedes Vim commands in a terminal window") ! call append("$", "\t" .. s:local_to_window) call OptionL("twk") call append("$", "termwinscroll\tmax number of lines to keep for scrollback in a terminal window") ! call append("$", "\t" .. s:local_to_window) if has('win32') call append("$", "termwintype\ttype of pty to use for a terminal window") call OptionG("twt", &twt) *************** *** 780,818 **** call append("$", "undoreload\tmaximum number lines to save for undo on a buffer reload") call append("$", " \tset ur=" . &ur) call append("$", "modified\tchanges have been made and not written to a file") ! call append("$", "\t(local to buffer)") call BinOptionL("mod") call append("$", "readonly\tbuffer is not to be written") ! call append("$", "\t(local to buffer)") call BinOptionL("ro") call append("$", "modifiable\tchanges to the text are not possible") ! call append("$", "\t(local to buffer)") call BinOptionL("ma") call append("$", "textwidth\tline length above which to break a line") ! call append("$", "\t(local to buffer)") call OptionL("tw") call append("$", "wrapmargin\tmargin from the right in which to break a line") ! call append("$", "\t(local to buffer)") call OptionL("wm") call append("$", "backspace\tspecifies what , CTRL-W, etc. can do in Insert mode") call append("$", " \tset bs=" . &bs) call append("$", "comments\tdefinition of what comment lines look like") ! call append("$", "\t(local to buffer)") call OptionL("com") call append("$", "formatoptions\tlist of flags that tell how automatic formatting works") ! call append("$", "\t(local to buffer)") call OptionL("fo") call append("$", "formatlistpat\tpattern to recognize a numbered list") ! call append("$", "\t(local to buffer)") call OptionL("flp") if has("eval") call append("$", "formatexpr\texpression used for \"gq\" to format lines") ! call append("$", "\t(local to buffer)") call OptionL("fex") endif if has("insert_expand") call append("$", "complete\tspecifies how Insert mode completion works for CTRL-N and CTRL-P") ! call append("$", "\t(local to buffer)") call OptionL("cpt") call append("$", "completeopt\twhether to use a popup menu for Insert mode completion") call OptionG("cot", &cot) --- 783,821 ---- call append("$", "undoreload\tmaximum number lines to save for undo on a buffer reload") call append("$", " \tset ur=" . &ur) call append("$", "modified\tchanges have been made and not written to a file") ! call append("$", "\t" .. s:local_to_buffer) call BinOptionL("mod") call append("$", "readonly\tbuffer is not to be written") ! call append("$", "\t" .. s:local_to_buffer) call BinOptionL("ro") call append("$", "modifiable\tchanges to the text are not possible") ! call append("$", "\t" .. s:local_to_buffer) call BinOptionL("ma") call append("$", "textwidth\tline length above which to break a line") ! call append("$", "\t" .. s:local_to_buffer) call OptionL("tw") call append("$", "wrapmargin\tmargin from the right in which to break a line") ! call append("$", "\t" .. s:local_to_buffer) call OptionL("wm") call append("$", "backspace\tspecifies what , CTRL-W, etc. can do in Insert mode") call append("$", " \tset bs=" . &bs) call append("$", "comments\tdefinition of what comment lines look like") ! call append("$", "\t" .. s:local_to_buffer) call OptionL("com") call append("$", "formatoptions\tlist of flags that tell how automatic formatting works") ! call append("$", "\t" .. s:local_to_buffer) call OptionL("fo") call append("$", "formatlistpat\tpattern to recognize a numbered list") ! call append("$", "\t" .. s:local_to_buffer) call OptionL("flp") if has("eval") call append("$", "formatexpr\texpression used for \"gq\" to format lines") ! call append("$", "\t" .. s:local_to_buffer) call OptionL("fex") endif if has("insert_expand") call append("$", "complete\tspecifies how Insert mode completion works for CTRL-N and CTRL-P") ! call append("$", "\t" .. s:local_to_buffer) call OptionL("cpt") call append("$", "completeopt\twhether to use a popup menu for Insert mode completion") call OptionG("cot", &cot) *************** *** 825,834 **** call append("$", "pumwidth\tminimum width of the popup menu") call OptionG("pw", &pw) call append("$", "completefunc\tuser defined function for Insert mode completion") ! call append("$", "\t(local to buffer)") call OptionL("cfu") call append("$", "omnifunc\tfunction for filetype-specific Insert mode completion") ! call append("$", "\t(local to buffer)") call OptionL("ofu") call append("$", "dictionary\tlist of dictionary files for keyword completion") call append("$", "\t(global or local to buffer)") --- 828,837 ---- call append("$", "pumwidth\tminimum width of the popup menu") call OptionG("pw", &pw) call append("$", "completefunc\tuser defined function for Insert mode completion") ! call append("$", "\t" .. s:local_to_buffer) call OptionL("cfu") call append("$", "omnifunc\tfunction for filetype-specific Insert mode completion") ! call append("$", "\t" .. s:local_to_buffer) call OptionL("ofu") call append("$", "dictionary\tlist of dictionary files for keyword completion") call append("$", "\t(global or local to buffer)") *************** *** 838,844 **** call OptionG("tsr", &tsr) endif call append("$", "infercase\tadjust case of a keyword completion match") ! call append("$", "\t(local to buffer)") call BinOptionL("inf") if has("digraphs") call append("$", "digraph\tenable entering digraphs with c1 c2") --- 841,847 ---- call OptionG("tsr", &tsr) endif call append("$", "infercase\tadjust case of a keyword completion match") ! call append("$", "\t" .. s:local_to_buffer) call BinOptionL("inf") if has("digraphs") call append("$", "digraph\tenable entering digraphs with c1 c2") *************** *** 853,930 **** call append("$", "matchtime\ttenth of a second to show a match for 'showmatch'") call append("$", " \tset mat=" . &mat) call append("$", "matchpairs\tlist of pairs that match for the \"%\" command") ! call append("$", "\t(local to buffer)") call OptionL("mps") call append("$", "joinspaces\tuse two spaces after '.' when joining a line") call BinOptionG("js", &js) call append("$", "nrformats\t\"alpha\", \"octal\" and/or \"hex\"; number formats recognized for") call append("$", "\tCTRL-A and CTRL-X commands") ! call append("$", "\t(local to buffer)") call OptionL("nf") call Header("tabs and indenting") call append("$", "tabstop\tnumber of spaces a in the text stands for") ! call append("$", "\t(local to buffer)") call OptionL("ts") call append("$", "shiftwidth\tnumber of spaces used for each step of (auto)indent") ! call append("$", "\t(local to buffer)") call OptionL("sw") if has("vartabs") call append("$", "vartabstop\tlist of number of spaces a tab counts for") ! call append("$", "\t(local to buffer)") call OptionL("vts") call append("$", "varsofttabstop\tlist of number of spaces a soft tabsstop counts for") ! call append("$", "\t(local to buffer)") call OptionL("vsts") endif call append("$", "smarttab\ta in an indent inserts 'shiftwidth' spaces") call BinOptionG("sta", &sta) call append("$", "softtabstop\tif non-zero, number of spaces to insert for a ") ! call append("$", "\t(local to buffer)") call OptionL("sts") call append("$", "shiftround\tround to 'shiftwidth' for \"<<\" and \">>\"") call BinOptionG("sr", &sr) call append("$", "expandtab\texpand to spaces in Insert mode") ! call append("$", "\t(local to buffer)") call BinOptionL("et") call append("$", "autoindent\tautomatically set the indent of a new line") ! call append("$", "\t(local to buffer)") call BinOptionL("ai") if has("smartindent") call append("$", "smartindent\tdo clever autoindenting") ! call append("$", "\t(local to buffer)") call BinOptionL("si") endif if has("cindent") call append("$", "cindent\tenable specific indenting for C code") ! call append("$", "\t(local to buffer)") call BinOptionL("cin") call append("$", "cinoptions\toptions for C-indenting") ! call append("$", "\t(local to buffer)") call OptionL("cino") call append("$", "cinkeys\tkeys that trigger C-indenting in Insert mode") ! call append("$", "\t(local to buffer)") call OptionL("cink") call append("$", "cinwords\tlist of words that cause more C-indent") ! call append("$", "\t(local to buffer)") call OptionL("cinw") call append("$", "indentexpr\texpression used to obtain the indent of a line") ! call append("$", "\t(local to buffer)") call OptionL("inde") call append("$", "indentkeys\tkeys that trigger indenting with 'indentexpr' in Insert mode") ! call append("$", "\t(local to buffer)") call OptionL("indk") endif call append("$", "copyindent\tcopy whitespace for indenting from previous line") ! call append("$", "\t(local to buffer)") call BinOptionL("ci") call append("$", "preserveindent\tpreserve kind of whitespace when changing indent") ! call append("$", "\t(local to buffer)") call BinOptionL("pi") if has("lispindent") call append("$", "lisp\tenable lisp mode") ! call append("$", "\t(local to buffer)") call BinOptionL("lisp") call append("$", "lispwords\twords that change how lisp indenting works") call OptionL("lw") --- 856,933 ---- call append("$", "matchtime\ttenth of a second to show a match for 'showmatch'") call append("$", " \tset mat=" . &mat) call append("$", "matchpairs\tlist of pairs that match for the \"%\" command") ! call append("$", "\t" .. s:local_to_buffer) call OptionL("mps") call append("$", "joinspaces\tuse two spaces after '.' when joining a line") call BinOptionG("js", &js) call append("$", "nrformats\t\"alpha\", \"octal\" and/or \"hex\"; number formats recognized for") call append("$", "\tCTRL-A and CTRL-X commands") ! call append("$", "\t" .. s:local_to_buffer) call OptionL("nf") call Header("tabs and indenting") call append("$", "tabstop\tnumber of spaces a in the text stands for") ! call append("$", "\t" .. s:local_to_buffer) call OptionL("ts") call append("$", "shiftwidth\tnumber of spaces used for each step of (auto)indent") ! call append("$", "\t" .. s:local_to_buffer) call OptionL("sw") if has("vartabs") call append("$", "vartabstop\tlist of number of spaces a tab counts for") ! call append("$", "\t" .. s:local_to_buffer) call OptionL("vts") call append("$", "varsofttabstop\tlist of number of spaces a soft tabsstop counts for") ! call append("$", "\t" .. s:local_to_buffer) call OptionL("vsts") endif call append("$", "smarttab\ta in an indent inserts 'shiftwidth' spaces") call BinOptionG("sta", &sta) call append("$", "softtabstop\tif non-zero, number of spaces to insert for a ") ! call append("$", "\t" .. s:local_to_buffer) call OptionL("sts") call append("$", "shiftround\tround to 'shiftwidth' for \"<<\" and \">>\"") call BinOptionG("sr", &sr) call append("$", "expandtab\texpand to spaces in Insert mode") ! call append("$", "\t" .. s:local_to_buffer) call BinOptionL("et") call append("$", "autoindent\tautomatically set the indent of a new line") ! call append("$", "\t" .. s:local_to_buffer) call BinOptionL("ai") if has("smartindent") call append("$", "smartindent\tdo clever autoindenting") ! call append("$", "\t" .. s:local_to_buffer) call BinOptionL("si") endif if has("cindent") call append("$", "cindent\tenable specific indenting for C code") ! call append("$", "\t" .. s:local_to_buffer) call BinOptionL("cin") call append("$", "cinoptions\toptions for C-indenting") ! call append("$", "\t" .. s:local_to_buffer) call OptionL("cino") call append("$", "cinkeys\tkeys that trigger C-indenting in Insert mode") ! call append("$", "\t" .. s:local_to_buffer) call OptionL("cink") call append("$", "cinwords\tlist of words that cause more C-indent") ! call append("$", "\t" .. s:local_to_buffer) call OptionL("cinw") call append("$", "indentexpr\texpression used to obtain the indent of a line") ! call append("$", "\t" .. s:local_to_buffer) call OptionL("inde") call append("$", "indentkeys\tkeys that trigger indenting with 'indentexpr' in Insert mode") ! call append("$", "\t" .. s:local_to_buffer) call OptionL("indk") endif call append("$", "copyindent\tcopy whitespace for indenting from previous line") ! call append("$", "\t" .. s:local_to_buffer) call BinOptionL("ci") call append("$", "preserveindent\tpreserve kind of whitespace when changing indent") ! call append("$", "\t" .. s:local_to_buffer) call BinOptionL("pi") if has("lispindent") call append("$", "lisp\tenable lisp mode") ! call append("$", "\t" .. s:local_to_buffer) call BinOptionL("lisp") call append("$", "lispwords\twords that change how lisp indenting works") call OptionL("lw") *************** *** 934,975 **** if has("folding") call Header("folding") call append("$", "foldenable\tset to display all folds open") ! call append("$", "\t(local to window)") call BinOptionL("fen") call append("$", "foldlevel\tfolds with a level higher than this number will be closed") ! call append("$", "\t(local to window)") call OptionL("fdl") call append("$", "foldlevelstart\tvalue for 'foldlevel' when starting to edit a file") call append("$", " \tset fdls=" . &fdls) call append("$", "foldcolumn\twidth of the column used to indicate folds") ! call append("$", "\t(local to window)") call OptionL("fdc") call append("$", "foldtext\texpression used to display the text of a closed fold") ! call append("$", "\t(local to window)") call OptionL("fdt") call append("$", "foldclose\tset to \"all\" to close a fold when the cursor leaves it") call OptionG("fcl", &fcl) call append("$", "foldopen\tspecifies for which commands a fold will be opened") call OptionG("fdo", &fdo) call append("$", "foldminlines\tminimum number of screen lines for a fold to be closed") ! call append("$", "\t(local to window)") call OptionL("fml") call append("$", "commentstring\ttemplate for comments; used to put the marker in") call OptionL("cms") call append("$", "foldmethod\tfolding type: \"manual\", \"indent\", \"expr\", \"marker\" or \"syntax\"") ! call append("$", "\t(local to window)") call OptionL("fdm") call append("$", "foldexpr\texpression used when 'foldmethod' is \"expr\"") ! call append("$", "\t(local to window)") call OptionL("fde") call append("$", "foldignore\tused to ignore lines when 'foldmethod' is \"indent\"") ! call append("$", "\t(local to window)") call OptionL("fdi") call append("$", "foldmarker\tmarkers used when 'foldmethod' is \"marker\"") ! call append("$", "\t(local to window)") call OptionL("fmr") call append("$", "foldnestmax\tmaximum fold depth for when 'foldmethod' is \"indent\" or \"syntax\"") ! call append("$", "\t(local to window)") call OptionL("fdn") endif --- 937,978 ---- if has("folding") call Header("folding") call append("$", "foldenable\tset to display all folds open") ! call append("$", "\t" .. s:local_to_window) call BinOptionL("fen") call append("$", "foldlevel\tfolds with a level higher than this number will be closed") ! call append("$", "\t" .. s:local_to_window) call OptionL("fdl") call append("$", "foldlevelstart\tvalue for 'foldlevel' when starting to edit a file") call append("$", " \tset fdls=" . &fdls) call append("$", "foldcolumn\twidth of the column used to indicate folds") ! call append("$", "\t" .. s:local_to_window) call OptionL("fdc") call append("$", "foldtext\texpression used to display the text of a closed fold") ! call append("$", "\t" .. s:local_to_window) call OptionL("fdt") call append("$", "foldclose\tset to \"all\" to close a fold when the cursor leaves it") call OptionG("fcl", &fcl) call append("$", "foldopen\tspecifies for which commands a fold will be opened") call OptionG("fdo", &fdo) call append("$", "foldminlines\tminimum number of screen lines for a fold to be closed") ! call append("$", "\t" .. s:local_to_window) call OptionL("fml") call append("$", "commentstring\ttemplate for comments; used to put the marker in") call OptionL("cms") call append("$", "foldmethod\tfolding type: \"manual\", \"indent\", \"expr\", \"marker\" or \"syntax\"") ! call append("$", "\t" .. s:local_to_window) call OptionL("fdm") call append("$", "foldexpr\texpression used when 'foldmethod' is \"expr\"") ! call append("$", "\t" .. s:local_to_window) call OptionL("fde") call append("$", "foldignore\tused to ignore lines when 'foldmethod' is \"indent\"") ! call append("$", "\t" .. s:local_to_window) call OptionL("fdi") call append("$", "foldmarker\tmarkers used when 'foldmethod' is \"marker\"") ! call append("$", "\t" .. s:local_to_window) call OptionL("fmr") call append("$", "foldnestmax\tmaximum fold depth for when 'foldmethod' is \"indent\" or \"syntax\"") ! call append("$", "\t" .. s:local_to_window) call OptionL("fdn") endif *************** *** 977,983 **** if has("diff") call Header("diff mode") call append("$", "diff\tuse diff mode for the current window") ! call append("$", "\t(local to window)") call BinOptionL("diff") call append("$", "diffopt\toptions for using diff mode") call OptionG("dip", &dip) --- 980,986 ---- if has("diff") call Header("diff mode") call append("$", "diff\tuse diff mode for the current window") ! call append("$", "\t" .. s:local_to_window) call BinOptionL("diff") call append("$", "diffopt\toptions for using diff mode") call OptionG("dip", &dip) *************** *** 1005,1035 **** call Header("reading and writing files") call append("$", "modeline\tenable using settings from modelines when reading a file") ! call append("$", "\t(local to buffer)") call BinOptionL("ml") call append("$", "modelineexpr\tallow setting expression options from a modeline") call BinOptionG("mle", &mle) call append("$", "modelines\tnumber of lines to check for modelines") call append("$", " \tset mls=" . &mls) call append("$", "binary\tbinary file editing") ! call append("$", "\t(local to buffer)") call BinOptionL("bin") call append("$", "endofline\tlast line in the file has an end-of-line") ! call append("$", "\t(local to buffer)") call BinOptionL("eol") call append("$", "fixendofline\tfixes missing end-of-line at end of text file") ! call append("$", "\t(local to buffer)") call BinOptionL("fixeol") call append("$", "bomb\tprepend a Byte Order Mark to the file") ! call append("$", "\t(local to buffer)") call BinOptionL("bomb") call append("$", "fileformat\tend-of-line format: \"dos\", \"unix\" or \"mac\"") ! call append("$", "\t(local to buffer)") call OptionL("ff") call append("$", "fileformats\tlist of file formats to look for when editing a file") call OptionG("ffs", &ffs) call append("$", "textmode\tobsolete, use 'fileformat'") ! call append("$", "\t(local to buffer)") call BinOptionL("tx") call append("$", "textauto\tobsolete, use 'fileformats'") call BinOptionG("ta", &ta) --- 1008,1038 ---- call Header("reading and writing files") call append("$", "modeline\tenable using settings from modelines when reading a file") ! call append("$", "\t" .. s:local_to_buffer) call BinOptionL("ml") call append("$", "modelineexpr\tallow setting expression options from a modeline") call BinOptionG("mle", &mle) call append("$", "modelines\tnumber of lines to check for modelines") call append("$", " \tset mls=" . &mls) call append("$", "binary\tbinary file editing") ! call append("$", "\t" .. s:local_to_buffer) call BinOptionL("bin") call append("$", "endofline\tlast line in the file has an end-of-line") ! call append("$", "\t" .. s:local_to_buffer) call BinOptionL("eol") call append("$", "fixendofline\tfixes missing end-of-line at end of text file") ! call append("$", "\t" .. s:local_to_buffer) call BinOptionL("fixeol") call append("$", "bomb\tprepend a Byte Order Mark to the file") ! call append("$", "\t" .. s:local_to_buffer) call BinOptionL("bomb") call append("$", "fileformat\tend-of-line format: \"dos\", \"unix\" or \"mac\"") ! call append("$", "\t" .. s:local_to_buffer) call OptionL("ff") call append("$", "fileformats\tlist of file formats to look for when editing a file") call OptionG("ffs", &ffs) call append("$", "textmode\tobsolete, use 'fileformat'") ! call append("$", "\t" .. s:local_to_buffer) call BinOptionL("tx") call append("$", "textauto\tobsolete, use 'fileformats'") call BinOptionG("ta", &ta) *************** *** 1062,1071 **** call append("$", "fsync\tforcibly sync the file to disk after writing it") call BinOptionG("fs", &fs) call append("$", "shortname\tuse 8.3 file names") ! call append("$", "\t(local to buffer)") call BinOptionL("sn") call append("$", "cryptmethod\tencryption method for file writing: zip or blowfish") ! call append("$", "\t(local to buffer)") call OptionL("cm") --- 1065,1074 ---- call append("$", "fsync\tforcibly sync the file to disk after writing it") call BinOptionG("fs", &fs) call append("$", "shortname\tuse 8.3 file names") ! call append("$", "\t" .. s:local_to_buffer) call BinOptionL("sn") call append("$", "cryptmethod\tencryption method for file writing: zip or blowfish") ! call append("$", "\t" .. s:local_to_buffer) call OptionL("cm") *************** *** 1073,1079 **** call append("$", "directory\tlist of directories for the swap file") call OptionG("dir", &dir) call append("$", "swapfile\tuse a swap file for this buffer") ! call append("$", "\t(local to buffer)") call BinOptionL("swf") call append("$", "swapsync\t\"sync\", \"fsync\" or empty; how to flush a swap file to disk") call OptionG("sws", &sws) --- 1076,1082 ---- call append("$", "directory\tlist of directories for the swap file") call OptionG("dir", &dir) call append("$", "swapfile\tuse a swap file for this buffer") ! call append("$", "\t" .. s:local_to_buffer) call BinOptionL("swf") call append("$", "swapsync\t\"sync\", \"fsync\" or empty; how to flush a swap file to disk") call OptionG("sws", &sws) *************** *** 1104,1110 **** call OptionG("su", &su) if has("file_in_path") call append("$", "suffixesadd\tlist of file name extensions added when searching for a file") ! call append("$", "\t(local to buffer)") call OptionL("sua") endif if has("wildignore") --- 1107,1113 ---- call OptionG("su", &su) if has("file_in_path") call append("$", "suffixesadd\tlist of file name extensions added when searching for a file") ! call append("$", "\t" .. s:local_to_buffer) call OptionL("sua") endif if has("wildignore") *************** *** 1186,1192 **** call Header("system specific") if has("osfiletype") call append("$", "osfiletype\tOS-specific information about the type of file") ! call append("$", "\t(local to buffer)") call OptionL("oft") endif if has("win32") --- 1189,1195 ---- call Header("system specific") if has("osfiletype") call append("$", "osfiletype\tOS-specific information about the type of file") ! call append("$", "\t" .. s:local_to_buffer) call OptionL("oft") endif if has("win32") *************** *** 1204,1224 **** call append("$", "isident\tspecifies the characters in an identifier") call OptionG("isi", &isi) call append("$", "iskeyword\tspecifies the characters in a keyword") ! call append("$", "\t(local to buffer)") call OptionL("isk") call append("$", "isprint\tspecifies printable characters") call OptionG("isp", &isp) if has("textobjects") call append("$", "quoteescape\tspecifies escape characters in a string") ! call append("$", "\t(local to buffer)") call OptionL("qe") endif if has("rightleft") call append("$", "rightleft\tdisplay the buffer right-to-left") ! call append("$", "\t(local to window)") call BinOptionL("rl") call append("$", "rightleftcmd\twhen to edit the command-line right-to-left") ! call append("$", "\t(local to window)") call OptionL("rlc") call append("$", "revins\tinsert characters backwards") call BinOptionG("ri", &ri) --- 1207,1227 ---- call append("$", "isident\tspecifies the characters in an identifier") call OptionG("isi", &isi) call append("$", "iskeyword\tspecifies the characters in a keyword") ! call append("$", "\t" .. s:local_to_buffer) call OptionL("isk") call append("$", "isprint\tspecifies printable characters") call OptionG("isp", &isp) if has("textobjects") call append("$", "quoteescape\tspecifies escape characters in a string") ! call append("$", "\t" .. s:local_to_buffer) call OptionL("qe") endif if has("rightleft") call append("$", "rightleft\tdisplay the buffer right-to-left") ! call append("$", "\t" .. s:local_to_window) call BinOptionL("rl") call append("$", "rightleftcmd\twhen to edit the command-line right-to-left") ! call append("$", "\t" .. s:local_to_window) call OptionL("rlc") call append("$", "revins\tinsert characters backwards") call BinOptionG("ri", &ri) *************** *** 1239,1245 **** endif if has("arabic") call append("$", "arabic\tprepare for editing Arabic text") ! call append("$", "\t(local to window)") call BinOptionL("arab") call append("$", "arabicshape\tperform shaping of Arabic characters") call BinOptionG("arshape", &arshape) --- 1242,1248 ---- endif if has("arabic") call append("$", "arabic\tprepare for editing Arabic text") ! call append("$", "\t" .. s:local_to_window) call BinOptionL("arab") call append("$", "arabicshape\tperform shaping of Arabic characters") call BinOptionG("arshape", &arshape) *************** *** 1261,1272 **** call BinOptionG("imd", &imd) endif call append("$", "iminsert\tin Insert mode: 1: use :lmap; 2: use IM; 0: neither") ! call append("$", "\t(local to window)") call OptionL("imi") call append("$", "imstyle\tinput method style, 0: on-the-spot, 1: over-the-spot") call OptionG("imst", &imst) call append("$", "imsearch\tentering a search pattern: 1: use :lmap; 2: use IM; 0: neither") ! call append("$", "\t(local to window)") call OptionL("ims") if has("xim") call append("$", "imcmdline\twhen set always use IM when starting to edit a command line") --- 1264,1275 ---- call BinOptionG("imd", &imd) endif call append("$", "iminsert\tin Insert mode: 1: use :lmap; 2: use IM; 0: neither") ! call append("$", "\t" .. s:local_to_window) call OptionL("imi") call append("$", "imstyle\tinput method style, 0: on-the-spot, 1: over-the-spot") call OptionG("imst", &imst) call append("$", "imsearch\tentering a search pattern: 1: use :lmap; 2: use IM; 0: neither") ! call append("$", "\t" .. s:local_to_window) call OptionL("ims") if has("xim") call append("$", "imcmdline\twhen set always use IM when starting to edit a command line") *************** *** 1283,1289 **** call append("$", "\t\"euc-jp\", \"big5\", etc.") call OptionG("enc", &enc) call append("$", "fileencoding\tcharacter encoding for the current file") ! call append("$", "\t(local to buffer)") call OptionL("fenc") call append("$", "fileencodings\tautomatically detected character encodings") call OptionG("fencs", &fencs) --- 1286,1292 ---- call append("$", "\t\"euc-jp\", \"big5\", etc.") call OptionG("enc", &enc) call append("$", "fileencoding\tcharacter encoding for the current file") ! call append("$", "\t" .. s:local_to_buffer) call OptionL("fenc") call append("$", "fileencodings\tautomatically detected character encodings") call OptionG("fencs", &fencs) *************** *** 1344,1363 **** endif if has("quickfix") call append("$", "bufhidden\twhat happens with a buffer when it's no longer in a window") ! call append("$", "\t(local to buffer)") call OptionL("bh") call append("$", "buftype\t\"\", \"nofile\", \"nowrite\" or \"quickfix\": type of buffer") ! call append("$", "\t(local to buffer)") call OptionL("bt") endif call append("$", "buflisted\twhether the buffer shows up in the buffer list") ! call append("$", "\t(local to buffer)") call BinOptionL("bl") call append("$", "debug\tset to \"msg\" to see all error messages") call append("$", " \tset debug=" . &debug) if has("signs") call append("$", "signcolumn\twhether to show the signcolumn") ! call append("$", "\t(local to window)") call OptionL("scl") endif if has("mzscheme") --- 1347,1366 ---- endif if has("quickfix") call append("$", "bufhidden\twhat happens with a buffer when it's no longer in a window") ! call append("$", "\t" .. s:local_to_buffer) call OptionL("bh") call append("$", "buftype\t\"\", \"nofile\", \"nowrite\" or \"quickfix\": type of buffer") ! call append("$", "\t" .. s:local_to_buffer) call OptionL("bt") endif call append("$", "buflisted\twhether the buffer shows up in the buffer list") ! call append("$", "\t" .. s:local_to_buffer) call BinOptionL("bl") call append("$", "debug\tset to \"msg\" to see all error messages") call append("$", " \tset debug=" . &debug) if has("signs") call append("$", "signcolumn\twhether to show the signcolumn") ! call append("$", "\t" .. s:local_to_window) call OptionL("scl") endif if has("mzscheme") *** ../vim-8.2.1638/src/version.c 2020-09-08 22:55:22.075652514 +0200 --- src/version.c 2020-09-09 12:55:19.246637442 +0200 *************** *** 756,757 **** --- 756,759 ---- { /* Add new patch number below this line */ + /**/ + 1639, /**/ -- ROBIN: The what? ARTHUR: The Holy Hand Grenade of Antioch. 'Tis one of the sacred relics Brother Maynard always carries with him. ALL: Yes. Of course. ARTHUR: (shouting) Bring up the Holy Hand Grenade! "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///