Mercurial > vim
changeset 15870:df0426d67bb3 v8.1.0942
patch 8.1.0942: options window still checks for the multi_byte feature
commit https://github.com/vim/vim/commit/76cbe811dafea0609e87ee4b9d025e2387e20fac
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Feb 17 17:53:49 2019 +0100
patch 8.1.0942: options window still checks for the multi_byte feature
Problem: Options window still checks for the multi_byte feature.
Solution: Remove the unnecessary check. (Dominique Pelle, closes https://github.com/vim/vim/issues/3990)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sun, 17 Feb 2019 18:00:12 +0100 |
| parents | e362e5e887bc |
| children | 117a43161cb5 |
| files | runtime/optwin.vim src/version.c |
| diffstat | 2 files changed, 33 insertions(+), 37 deletions(-) [+] |
line wrap: on
line diff
--- a/runtime/optwin.vim +++ b/runtime/optwin.vim @@ -685,12 +685,10 @@ if has("printer") call append("$", "printencoding\tencoding used to print the PostScript file for :hardcopy") call <SID>OptionG("penc", &penc) endif - if has("multi_byte") - call append("$", "printmbcharset\tthe CJK character set to be used for CJK output from :hardcopy") - call <SID>OptionG("pmbcs", &pmbcs) - call append("$", "printmbfont\tlist of font names to be used for CJK output from :hardcopy") - call <SID>OptionG("pmbfn", &pmbfn) - endif + call append("$", "printmbcharset\tthe CJK character set to be used for CJK output from :hardcopy") + call <SID>OptionG("pmbcs", &pmbcs) + call append("$", "printmbfont\tlist of font names to be used for CJK output from :hardcopy") + call <SID>OptionG("pmbfn", &pmbfn) endif call <SID>Header("messages and info") @@ -996,11 +994,9 @@ call <SID>BinOptionL("eol") call append("$", "fixendofline\tfixes missing end-of-line at end of text file") call append("$", "\t(local to buffer)") call <SID>BinOptionL("fixeol") -if has("multi_byte") - call append("$", "bomb\tprepend a Byte Order Mark to the file") - call append("$", "\t(local to buffer)") - call <SID>BinOptionL("bomb") -endif +call append("$", "bomb\tprepend a Byte Order Mark to the file") +call append("$", "\t(local to buffer)") +call <SID>BinOptionL("bomb") call append("$", "fileformat\tend-of-line format: \"dos\", \"unix\" or \"mac\"") call append("$", "\t(local to buffer)") call <SID>OptionL("ff") @@ -1252,33 +1248,31 @@ if has("xim") endif -if has("multi_byte") - call <SID>Header("multi-byte characters") - call append("$", "encoding\tcharacter encoding used in Vim: \"latin1\", \"utf-8\"") - call append("$", "\t\"euc-jp\", \"big5\", etc.") - call <SID>OptionG("enc", &enc) - call append("$", "fileencoding\tcharacter encoding for the current file") - call append("$", "\t(local to buffer)") - call <SID>OptionL("fenc") - call append("$", "fileencodings\tautomatically detected character encodings") - call <SID>OptionG("fencs", &fencs) - call append("$", "termencoding\tcharacter encoding used by the terminal") - call <SID>OptionG("tenc", &tenc) - call append("$", "charconvert\texpression used for character encoding conversion") - call <SID>OptionG("ccv", &ccv) - call append("$", "delcombine\tdelete combining (composing) characters on their own") - call <SID>BinOptionG("deco", &deco) - call append("$", "maxcombine\tmaximum number of combining (composing) characters displayed") - call <SID>OptionG("mco", &mco) - if has("xim") && has("gui_gtk") - call append("$", "imactivatekey\tkey that activates the X input method") - call <SID>OptionG("imak", &imak) - endif - call append("$", "ambiwidth\twidth of ambiguous width characters") - call <SID>OptionG("ambw", &ambw) - call append("$", "emoji\temoji characters are full width") - call <SID>BinOptionG("emo", &emo) +call <SID>Header("multi-byte characters") +call append("$", "encoding\tcharacter encoding used in Vim: \"latin1\", \"utf-8\"") +call append("$", "\t\"euc-jp\", \"big5\", etc.") +call <SID>OptionG("enc", &enc) +call append("$", "fileencoding\tcharacter encoding for the current file") +call append("$", "\t(local to buffer)") +call <SID>OptionL("fenc") +call append("$", "fileencodings\tautomatically detected character encodings") +call <SID>OptionG("fencs", &fencs) +call append("$", "termencoding\tcharacter encoding used by the terminal") +call <SID>OptionG("tenc", &tenc) +call append("$", "charconvert\texpression used for character encoding conversion") +call <SID>OptionG("ccv", &ccv) +call append("$", "delcombine\tdelete combining (composing) characters on their own") +call <SID>BinOptionG("deco", &deco) +call append("$", "maxcombine\tmaximum number of combining (composing) characters displayed") +call <SID>OptionG("mco", &mco) +if has("xim") && has("gui_gtk") + call append("$", "imactivatekey\tkey that activates the X input method") + call <SID>OptionG("imak", &imak) endif +call append("$", "ambiwidth\twidth of ambiguous width characters") +call <SID>OptionG("ambw", &ambw) +call append("$", "emoji\temoji characters are full width") +call <SID>BinOptionG("emo", &emo) call <SID>Header("various")