Patch 8.2.3781 Problem: The option window script is outdated. Solution: Add several changes. Files: runtime/optwin.vim
*** ../vim-8.2.3780/runtime/optwin.vim 2021-12-11 12:26:55.920402418 +0000 --- runtime/optwin.vim 2021-12-11 12:32:58.583514089 +0000 *************** *** 1,7 **** " These commands create the option window. " " Maintainer: Bram Moolenaar <[email protected]> ! " Last Change: 2020 Sep 10 " If there already is an option window, jump to that one. let buf = bufnr('option-window') --- 1,7 ---- " These commands create the option window. " " Maintainer: Bram Moolenaar <[email protected]> ! " Last Change: 2021 Dec 11 " If there already is an option window, jump to that one. let buf = bufnr('option-window') *************** *** 623,629 **** call <SID>OptionG("mousem", &mousem) call <SID>AddOption("mousetime", gettext("maximum time in msec to recognize a double-click")) call append("$", " \tset mouset=" . &mouset) ! call <SID>AddOption("ttymouse", gettext("\"xterm\", \"xterm2\", \"dec\" or \"netterm\"; type of mouse")) call <SID>OptionG("ttym", &ttym) if has("mouseshape") call <SID>AddOption("mouseshape", gettext("what the mouse pointer looks like in different modes")) --- 623,629 ---- call <SID>OptionG("mousem", &mousem) call <SID>AddOption("mousetime", gettext("maximum time in msec to recognize a double-click")) call append("$", " \tset mouset=" . &mouset) ! call <SID>AddOption("ttymouse", gettext("\"xterm\", \"xterm2\", \"sgr\", etc.; type of mouse")) call <SID>OptionG("ttym", &ttym) if has("mouseshape") call <SID>AddOption("mouseshape", gettext("what the mouse pointer looks like in different modes")) *************** *** 656,661 **** --- 656,663 ---- endif call <SID>AddOption("guiheadroom", gettext("room (in pixels) left above/below the window")) call append("$", " \tset ghr=" . &ghr) + call <SID>AddOption("guiligatures", gettext("list of ASCII characters that can be combined into complex shapes")) + call <SID>OptionG("gli", &gli) endif if has("directx") call <SID>AddOption("renderoptions", gettext("options for text rendering")) *************** *** 695,704 **** call append("$", " \tset bexpr=" . &bexpr) endif endif - if exists("+macatsui") - call <SID>AddOption("macatsui", gettext("use ATSUI text drawing; disable to avoid display problems")) - call <SID>OptionG("macatsui", &macatsui) - endif endif if has("printer") --- 697,702 ---- *************** *** 797,803 **** call <SID>AddOption("readonly", gettext("buffer is not to be written")) call append("$", "\t" .. s:local_to_buffer) call <SID>BinOptionL("ro") ! call <SID>AddOption("modifiable", gettext("changes to the text are not possible")) call append("$", "\t" .. s:local_to_buffer) call <SID>BinOptionL("ma") call <SID>AddOption("textwidth", gettext("line length above which to break a line")) --- 795,801 ---- call <SID>AddOption("readonly", gettext("buffer is not to be written")) call append("$", "\t" .. s:local_to_buffer) call <SID>BinOptionL("ro") ! call <SID>AddOption("modifiable", gettext("changes to the text are possible")) call append("$", "\t" .. s:local_to_buffer) call <SID>BinOptionL("ma") call <SID>AddOption("textwidth", gettext("line length above which to break a line")) *************** *** 848,853 **** --- 846,854 ---- call <SID>AddOption("thesaurus", gettext("list of thesaurus files for keyword completion")) call append("$", "\t" .. s:global_or_local) call <SID>OptionG("tsr", &tsr) + call <SID>AddOption("thesaurusfunc", gettext("function used for thesaurus completion")) + call append("$", "\t" .. s:global_or_local) + call <SID>OptionG("tsrfu", &tsrfu) endif call <SID>AddOption("infercase", gettext("adjust case of a keyword completion match")) call append("$", "\t" .. s:local_to_buffer) *************** *** 858,864 **** endif call <SID>AddOption("tildeop", gettext("the \"~\" command behaves like an operator")) call <SID>BinOptionG("top", &top) ! call <SID>AddOption("operatorfunc", gettext("function called for the\"g@\" operator")) call <SID>OptionG("opfunc", &opfunc) call <SID>AddOption("showmatch", gettext("when inserting a bracket, briefly jump to its match")) call <SID>BinOptionG("sm", &sm) --- 859,865 ---- endif call <SID>AddOption("tildeop", gettext("the \"~\" command behaves like an operator")) call <SID>BinOptionG("top", &top) ! call <SID>AddOption("operatorfunc", gettext("function called for the \"g@\" operator")) call <SID>OptionG("opfunc", &opfunc) call <SID>AddOption("showmatch", gettext("when inserting a bracket, briefly jump to its match")) call <SID>BinOptionG("sm", &sm) *************** *** 869,875 **** call <SID>OptionL("mps") call <SID>AddOption("joinspaces", gettext("use two spaces after '.' when joining a line")) call <SID>BinOptionG("js", &js) ! call <SID>AddOption("nrformats", gettext("\"alpha\", \"octal\" and/or \"hex\"; number formats recognized for\nCTRL-A and CTRL-X commands")) call append("$", "\t" .. s:local_to_buffer) call <SID>OptionL("nf") --- 870,876 ---- call <SID>OptionL("mps") call <SID>AddOption("joinspaces", gettext("use two spaces after '.' when joining a line")) call <SID>BinOptionG("js", &js) ! call <SID>AddOption("nrformats", gettext("\"alpha\", \"octal\", \"hex\", \"bin\" and/or \"unsigned\"; number formats\nrecognized for CTRL-A and CTRL-X commands")) call append("$", "\t" .. s:local_to_buffer) call <SID>OptionL("nf") *************** *** 944,950 **** if has("folding") call <SID>Header(gettext("folding")) ! call <SID>AddOption("foldenable", gettext("set to display all folds open")) call append("$", "\t" .. s:local_to_window) call <SID>BinOptionL("fen") call <SID>AddOption("foldlevel", gettext("folds with a level higher than this number will be closed")) --- 945,951 ---- if has("folding") call <SID>Header(gettext("folding")) ! call <SID>AddOption("foldenable", gettext("unset to display all folds open")) call append("$", "\t" .. s:local_to_window) call <SID>BinOptionL("fen") call <SID>AddOption("foldlevel", gettext("folds with a level higher than this number will be closed")) *************** *** 967,973 **** call <SID>OptionL("fml") call <SID>AddOption("commentstring", gettext("template for comments; used to put the marker in")) call <SID>OptionL("cms") ! call <SID>AddOption("foldmethod", gettext("folding type: \"manual\", \"indent\", \"expr\", \"marker\" or \"syntax\"")) call append("$", "\t" .. s:local_to_window) call <SID>OptionL("fdm") call <SID>AddOption("foldexpr", gettext("expression used when 'foldmethod' is \"expr\"")) --- 968,974 ---- call <SID>OptionL("fml") call <SID>AddOption("commentstring", gettext("template for comments; used to put the marker in")) call <SID>OptionL("cms") ! call <SID>AddOption("foldmethod", gettext("folding type: \"manual\", \"indent\", \"expr\", \"marker\",\n\"syntax\" or \"diff\"")) call append("$", "\t" .. s:local_to_window) call <SID>OptionL("fdm") call <SID>AddOption("foldexpr", gettext("expression used when 'foldmethod' is \"expr\"")) *************** *** 1075,1081 **** call <SID>AddOption("shortname", gettext("use 8.3 file names")) call append("$", "\t" .. s:local_to_buffer) call <SID>BinOptionL("sn") ! call <SID>AddOption("cryptmethod", gettext("encryption method for file writing: zip or blowfish")) call append("$", "\t" .. s:local_to_buffer) call <SID>OptionL("cm") --- 1076,1082 ---- call <SID>AddOption("shortname", gettext("use 8.3 file names")) call append("$", "\t" .. s:local_to_buffer) call <SID>BinOptionL("sn") ! call <SID>AddOption("cryptmethod", gettext("encryption method for file writing: zip, blowfish or blowfish2")) call append("$", "\t" .. s:local_to_buffer) call <SID>OptionL("cm") *************** *** 1099,1105 **** call <SID>Header(gettext("command line editing")) ! call <SID>AddOption("history", gettext("how many command lines are remembered ")) call append("$", " \tset hi=" . &hi) call <SID>AddOption("wildchar", gettext("key that triggers command-line expansion")) call append("$", " \tset wc=" . &wc) --- 1100,1106 ---- call <SID>Header(gettext("command line editing")) ! call <SID>AddOption("history", gettext("how many command lines are remembered")) call append("$", " \tset hi=" . &hi) call <SID>AddOption("wildchar", gettext("key that triggers command-line expansion")) call append("$", " \tset wc=" . &wc) *************** *** 1193,1211 **** endif ! if has("win32") || has("osfiletype") call <SID>Header(gettext("system specific")) ! if has("osfiletype") ! call <SID>AddOption("osfiletype", gettext("OS-specific information about the type of file")) ! call append("$", "\t" .. s:local_to_buffer) ! call <SID>OptionL("oft") ! endif ! if has("win32") ! call <SID>AddOption("shellslash", gettext("use forward slashes in file names; for Unix-like shells")) ! call <SID>BinOptionG("ssl", &ssl) ! call <SID>AddOption("completeslash", gettext("specifies slash/backslash used for completion")) ! call <SID>OptionG("csl", &csl) ! endif endif --- 1194,1205 ---- endif ! if has("win32") call <SID>Header(gettext("system specific")) ! call <SID>AddOption("shellslash", gettext("use forward slashes in file names; for Unix-like shells")) ! call <SID>BinOptionG("ssl", &ssl) ! call <SID>AddOption("completeslash", gettext("specifies slash/backslash used for completion")) ! call <SID>OptionG("csl", &csl) endif *************** *** 1242,1253 **** call <SID>AddOption("hkmapp", gettext("use phonetic Hebrew keyboard mapping")) call <SID>BinOptionG("hkp", &hkp) endif - if has("farsi") - call <SID>AddOption("altkeymap", gettext("use Farsi as the second language when 'revins' is set")) - call <SID>BinOptionG("akm", &akm) - call <SID>AddOption("fkmap", gettext("use Farsi keyboard mapping")) - call <SID>BinOptionG("fk", &fk) - endif if has("arabic") call <SID>AddOption("arabic", gettext("prepare for editing Arabic text")) call append("$", "\t" .. s:local_to_window) --- 1236,1241 ---- *************** *** 1290,1296 **** call <SID>Header(gettext("multi-byte characters")) ! call <SID>AddOption("encoding", gettext("character encoding used in Vim: \"latin1\", \"utf-8\"\n\"euc-jp\", \"big5\", etc.")) call <SID>OptionG("enc", &enc) call <SID>AddOption("fileencoding", gettext("character encoding for the current file")) call append("$", "\t" .. s:local_to_buffer) --- 1278,1284 ---- call <SID>Header(gettext("multi-byte characters")) ! call <SID>AddOption("encoding", gettext("character encoding used in Vim: \"latin1\", \"utf-8\",\n\"euc-jp\", \"big5\", etc.")) call <SID>OptionG("enc", &enc) call <SID>AddOption("fileencoding", gettext("character encoding for the current file")) call append("$", "\t" .. s:local_to_buffer) *************** *** 1316,1322 **** call <SID>Header(gettext("various")) ! call <SID>AddOption("virtualedit", gettext("when to use virtual editing: \"block\", \"insert\" and/or \"all\"")) call <SID>OptionG("ve", &ve) call <SID>AddOption("eventignore", gettext("list of autocommand events which are to be ignored")) call <SID>OptionG("ei", &ei) --- 1304,1310 ---- call <SID>Header(gettext("various")) ! call <SID>AddOption("virtualedit", gettext("when to use virtual editing: \"block\", \"insert\", \"all\"\nand/or \"onemore\"")) call <SID>OptionG("ve", &ve) call <SID>AddOption("eventignore", gettext("list of autocommand events which are to be ignored")) call <SID>OptionG("ei", &ei) *************** *** 1356,1362 **** call <SID>AddOption("bufhidden", gettext("what happens with a buffer when it's no longer in a window")) call append("$", "\t" .. s:local_to_buffer) call <SID>OptionL("bh") ! call <SID>AddOption("buftype", gettext("\"\", \"nofile\", \"nowrite\" or \"quickfix\": type of buffer")) call append("$", "\t" .. s:local_to_buffer) call <SID>OptionL("bt") endif --- 1344,1350 ---- call <SID>AddOption("bufhidden", gettext("what happens with a buffer when it's no longer in a window")) call append("$", "\t" .. s:local_to_buffer) call <SID>OptionL("bh") ! call <SID>AddOption("buftype", gettext("empty, \"nofile\", \"nowrite\", \"quickfix\", etc.: type of buffer")) call append("$", "\t" .. s:local_to_buffer) call <SID>OptionL("bt") endif *** ../vim-8.2.3780/src/version.c 2021-12-11 12:26:55.924402407 +0000 --- src/version.c 2021-12-11 12:32:00.295654371 +0000 *************** *** 755,756 **** --- 755,758 ---- { /* Add new patch number below this line */ + /**/ + 3781, /**/ -- How To Keep A Healthy Level Of Insanity: 3. Every time someone asks you to do something, ask if they want fries with that. /// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net \\\ /// \\\ \\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ /// \\\ help me help AIDS victims -- http://ICCF-Holland.org /// -- -- You received this message from the "vim_dev" maillist. Do not top-post! Type your reply below the text you are replying to. For more information, visit http://www.vim.org/maillist.php --- You received this message because you are subscribed to the Google Groups "vim_dev" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/vim_dev/20211211123434.985C81C09EE%40moolenaar.net.
