To: vim_dev@googlegroups.com Subject: Patch 8.2.1716 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.1716 Problem: Options window has duplicate translations. Solution: Make one entry for "global or local to buffer". Fix wrong text. (closes #6983) Files: runtime/optwin.vim *** ../vim-8.2.1715/runtime/optwin.vim 2020-09-11 20:51:22.835620641 +0200 --- runtime/optwin.vim 2020-09-20 21:28:50.019754405 +0200 *************** *** 71,76 **** --- 71,77 ---- let s:local_to_window = gettext('(local to window)') let s:local_to_buffer = gettext('(local to buffer)') + let s:global_or_local = gettext('(global or local to buffer)') " find the window in which the option applies " returns 0 for global option, 1 for local option, -1 for error *************** *** 257,263 **** call AddOption("sections", gettext("nroff macro names that separate sections")) call OptionG("sect", §) call AddOption("path", gettext("list of directory names used for file searching")) ! call append("$", gettext("\t(global or local to buffer)")) call OptionG("pa", &pa) call AddOption("cdpath", gettext("list of directory names used for :cd")) call OptionG("cd", &cd) --- 258,264 ---- call AddOption("sections", gettext("nroff macro names that separate sections")) call OptionG("sect", §) call AddOption("path", gettext("list of directory names used for file searching")) ! call append("$", "\t" .. s:global_or_local) call OptionG("pa", &pa) call AddOption("cdpath", gettext("list of directory names used for :cd")) call OptionG("cd", &cd) *************** *** 282,288 **** call AddOption("maxmempattern", gettext("maximum amount of memory in Kbyte used for pattern matching")) call append("$", " \tset mmp=" . &mmp) call AddOption("define", gettext("pattern for a macro definition line")) ! call append("$", gettext("\t(global or local to buffer)")) call OptionG("def", &def) if has("find_in_path") call AddOption("include", gettext("pattern for an include-file line")) --- 283,289 ---- call AddOption("maxmempattern", gettext("maximum amount of memory in Kbyte used for pattern matching")) call append("$", " \tset mmp=" . &mmp) call AddOption("define", gettext("pattern for a macro definition line")) ! call append("$", "\t" .. s:global_or_local) call OptionG("def", &def) if has("find_in_path") call AddOption("include", gettext("pattern for an include-file line")) *************** *** 300,309 **** call AddOption("taglength", gettext("number of significant characters in a tag name or zero")) call append("$", " \tset tl=" . &tl) call AddOption("tags", gettext("list of file names to search for tags")) ! call append("$", gettext("\t(global or local to buffer)")) call OptionG("tag", &tag) call AddOption("tagcase", gettext("how to handle case when searching in tags files:\n\"followic\" to follow 'ignorecase', \"ignore\" or \"match\"")) ! call append("$", "\t(global or local to buffer)") call OptionG("tc", &tc) call AddOption("tagrelative", gettext("file names in a tags file are relative to the tags file")) call BinOptionG("tr", &tr) --- 301,310 ---- call AddOption("taglength", gettext("number of significant characters in a tag name or zero")) call append("$", " \tset tl=" . &tl) call AddOption("tags", gettext("list of file names to search for tags")) ! call append("$", "\t" .. s:global_or_local) call OptionG("tag", &tag) call AddOption("tagcase", gettext("how to handle case when searching in tags files:\n\"followic\" to follow 'ignorecase', \"ignore\" or \"match\"")) ! call append("$", "\t" .. s:global_or_local) call OptionG("tc", &tc) call AddOption("tagrelative", gettext("file names in a tags file are relative to the tags file")) call BinOptionG("tr", &tr) *************** *** 776,782 **** call Header(gettext("editing text")) call AddOption("undolevels", gettext("maximum number of changes that can be undone")) ! call append("$", gettext("\t(global or local to buffer)")) call append("$", " \tset ul=" . s:old_ul) call AddOption("undofile", gettext("automatically save and restore undo history")) call BinOptionG("udf", &udf) --- 777,783 ---- call Header(gettext("editing text")) call AddOption("undolevels", gettext("maximum number of changes that can be undone")) ! call append("$", "\t" .. s:global_or_local) call append("$", " \tset ul=" . s:old_ul) call AddOption("undofile", gettext("automatically save and restore undo history")) call BinOptionG("udf", &udf) *************** *** 836,845 **** call append("$", "\t" .. s:local_to_buffer) call OptionL("ofu") call AddOption("dictionary", gettext("list of dictionary files for keyword completion")) ! call append("$", gettext("\t(global or local to buffer)")) call OptionG("dict", &dict) call AddOption("thesaurus", gettext("list of thesaurus files for keyword completion")) ! call append("$", gettext("\t(global or local to buffer)")) call OptionG("tsr", &tsr) endif call AddOption("infercase", gettext("adjust case of a keyword completion match")) --- 837,846 ---- call append("$", "\t" .. s:local_to_buffer) call OptionL("ofu") call AddOption("dictionary", gettext("list of dictionary files for keyword completion")) ! call append("$", "\t" .. s:global_or_local) call OptionG("dict", &dict) call AddOption("thesaurus", gettext("list of thesaurus files for keyword completion")) ! call append("$", "\t" .. s:global_or_local) call OptionG("tsr", &tsr) endif call AddOption("infercase", gettext("adjust case of a keyword completion match")) *************** *** 1046,1052 **** call AddOption("backupskip", gettext("patterns that specify for which files a backup is not made")) call append("$", " \tset bsk=" . &bsk) call AddOption("backupcopy", gettext("whether to make the backup as a copy or rename the existing file")) ! call append("$", gettext("\t(global or local to buffer)")) call append("$", " \tset bkc=" . &bkc) call AddOption("backupdir", gettext("list of directories to put backup files in")) call OptionG("bdir", &bdir) --- 1047,1053 ---- call AddOption("backupskip", gettext("patterns that specify for which files a backup is not made")) call append("$", " \tset bsk=" . &bsk) call AddOption("backupcopy", gettext("whether to make the backup as a copy or rename the existing file")) ! call append("$", "\t" .. s:global_or_local) call append("$", " \tset bkc=" . &bkc) call AddOption("backupdir", gettext("list of directories to put backup files in")) call OptionG("bdir", &bdir) *************** *** 1059,1065 **** call AddOption("writeany", gettext("always write without asking for confirmation")) call BinOptionG("wa", &wa) call AddOption("autoread", gettext("automatically read a file when it was modified outside of Vim")) ! call append("$", gettext("\t(global or local to buffer)")) call BinOptionG("ar", &ar) call AddOption("patchmode", gettext("keep oldest version of a file; specifies file name extension")) call OptionG("pm", &pm) --- 1060,1066 ---- call AddOption("writeany", gettext("always write without asking for confirmation")) call BinOptionG("wa", &wa) call AddOption("autoread", gettext("automatically read a file when it was modified outside of Vim")) ! call append("$", "\t" .. s:global_or_local) call BinOptionG("ar", &ar) call AddOption("patchmode", gettext("keep oldest version of a file; specifies file name extension")) call OptionG("pm", &pm) *************** *** 1149,1155 **** call AddOption("shelltemp", gettext("use a temp file for shell commands instead of using a pipe")) call BinOptionG("stmp", &stmp) call AddOption("equalprg", gettext("program used for \"=\" command")) ! call append("$", gettext("\t(global or local to buffer)")) call OptionG("ep", &ep) call AddOption("formatprg", gettext("program used to format lines with \"gq\" command")) call OptionG("fp", &fp) --- 1150,1156 ---- call AddOption("shelltemp", gettext("use a temp file for shell commands instead of using a pipe")) call BinOptionG("stmp", &stmp) call AddOption("equalprg", gettext("program used for \"=\" command")) ! call append("$", "\t" .. s:global_or_local) call OptionG("ep", &ep) call AddOption("formatprg", gettext("program used to format lines with \"gq\" command")) call OptionG("fp", &fp) *************** *** 1164,1185 **** call AddOption("errorfile", gettext("name of the file that contains error messages")) call OptionG("ef", &ef) call AddOption("errorformat", gettext("list of formats for error messages")) ! call append("$", gettext("\t(global or local to buffer)")) call OptionG("efm", &efm) call AddOption("makeprg", gettext("program used for the \":make\" command")) ! call append("$", gettext("\t(global or local to buffer)")) call OptionG("mp", &mp) call AddOption("shellpipe", gettext("string used to put the output of \":make\" in the error file")) call OptionG("sp", &sp) call AddOption("makeef", gettext("name of the errorfile for the 'makeprg' command")) call OptionG("mef", &mef) call AddOption("grepprg", gettext("program used for the \":grep\" command")) ! call append("$", gettext("\t(global or local to buffer)")) call OptionG("gp", &gp) call AddOption("grepformat", gettext("list of formats for output of 'grepprg'")) call OptionG("gfm", &gfm) call AddOption("makeencoding", gettext("encoding of the \":make\" and \":grep\" output")) ! call append("$", gettext("\t(global or local to buffer)")) call OptionG("menc", &menc) call AddOption("quickfixtextfunc", gettext("function to display text in the quickfix window")) call OptionG("qftf", &qftf) --- 1165,1186 ---- call AddOption("errorfile", gettext("name of the file that contains error messages")) call OptionG("ef", &ef) call AddOption("errorformat", gettext("list of formats for error messages")) ! call append("$", "\t" .. s:global_or_local) call OptionG("efm", &efm) call AddOption("makeprg", gettext("program used for the \":make\" command")) ! call append("$", "\t" .. s:global_or_local) call OptionG("mp", &mp) call AddOption("shellpipe", gettext("string used to put the output of \":make\" in the error file")) call OptionG("sp", &sp) call AddOption("makeef", gettext("name of the errorfile for the 'makeprg' command")) call OptionG("mef", &mef) call AddOption("grepprg", gettext("program used for the \":grep\" command")) ! call append("$", "\t" .. s:global_or_local) call OptionG("gp", &gp) call AddOption("grepformat", gettext("list of formats for output of 'grepprg'")) call OptionG("gfm", &gfm) call AddOption("makeencoding", gettext("encoding of the \":make\" and \":grep\" output")) ! call append("$", "\t" .. s:global_or_local) call OptionG("menc", &menc) call AddOption("quickfixtextfunc", gettext("function to display text in the quickfix window")) call OptionG("qftf", &qftf) *************** *** 1404,1412 **** call OptionG("tcldll", &tcldll) endif if exists("&mzschemedll") ! call AddOption("mzschemedll", gettext("name of the Tcl dynamic library")) call OptionG("mzschemedll", &mzschemedll) ! call AddOption("mzschemegcdll", gettext("name of the Tcl GC dynamic library")) call OptionG("mzschemegcdll", &mzschemegcdll) endif --- 1405,1413 ---- call OptionG("tcldll", &tcldll) endif if exists("&mzschemedll") ! call AddOption("mzschemedll", gettext("name of the MzScheme dynamic library")) call OptionG("mzschemedll", &mzschemedll) ! call AddOption("mzschemegcdll", gettext("name of the MzScheme GC dynamic library")) call OptionG("mzschemegcdll", &mzschemegcdll) endif *** ../vim-8.2.1715/src/version.c 2020-09-20 21:13:18.273271296 +0200 --- src/version.c 2020-09-20 21:30:46.943097401 +0200 *************** *** 752,753 **** --- 752,755 ---- { /* Add new patch number below this line */ + /**/ + 1716, /**/ -- Friends? I have lots of friends! In fact, I have all episodes ever made. /// 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 ///