aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.1.0942: options window still checks for the multi_byte feature

Browse Source 
Problem:    Options window still checks for the multi_byte feature.
Solution:   Remove the unnecessary check. (Dominique Pelle, closes #3990)
This commit is contained in:
Bram Moolenaar 2019-02-17 17:53:49 +01:00
parent 4f97475d32
commit 76cbe811da
2 changed files with 33 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
runtime/optwin.vim
View File

@ -685,12 +685,10 @@ if has("printer")
call append("$", "printencoding\tencoding used to print the PostScript file for :hardcopy") call append("$", "printencoding\tencoding used to print the PostScript file for :hardcopy")
call <SID>OptionG("penc", &penc) call <SID>OptionG("penc", &penc)
endif endif
if has("multi_byte") call append("$", "printmbcharset\tthe CJK character set to be used for CJK output from :hardcopy")
call append("$", "printmbcharset\tthe CJK character set to be used for CJK output from :hardcopy") call <SID>OptionG("pmbcs", &pmbcs)
call <SID>OptionG("pmbcs", &pmbcs) call append("$", "printmbfont\tlist of font names to be used for CJK output from :hardcopy")
call append("$", "printmbfont\tlist of font names to be used for CJK output from :hardcopy") call <SID>OptionG("pmbfn", &pmbfn)
call <SID>OptionG("pmbfn", &pmbfn)
endif
endif endif
call <SID>Header("messages and info") 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("$", "fixendofline\tfixes missing end-of-line at end of text file")
call append("$", "\t(local to buffer)") call append("$", "\t(local to buffer)")
call <SID>BinOptionL("fixeol") call <SID>BinOptionL("fixeol")
if has("multi_byte") call append("$", "bomb\tprepend a Byte Order Mark to the file")
call append("$", "bomb\tprepend a Byte Order Mark to the file") call append("$", "\t(local to buffer)")
call append("$", "\t(local to buffer)") call <SID>BinOptionL("bomb")
call <SID>BinOptionL("bomb")
endif
call append("$", "fileformat\tend-of-line format: \"dos\", \"unix\" or \"mac\"") call append("$", "fileformat\tend-of-line format: \"dos\", \"unix\" or \"mac\"")
call append("$", "\t(local to buffer)") call append("$", "\t(local to buffer)")
call <SID>OptionL("ff") call <SID>OptionL("ff")
@ -1252,33 +1248,31 @@ if has("xim")
endif endif
if has("multi_byte") call <SID>Header("multi-byte characters")
call <SID>Header("multi-byte characters") call append("$", "encoding\tcharacter encoding used in Vim: \"latin1\", \"utf-8\"")
call append("$", "encoding\tcharacter encoding used in Vim: \"latin1\", \"utf-8\"") call append("$", "\t\"euc-jp\", \"big5\", etc.")
call append("$", "\t\"euc-jp\", \"big5\", etc.") call <SID>OptionG("enc", &enc)
call <SID>OptionG("enc", &enc) call append("$", "fileencoding\tcharacter encoding for the current file")
call append("$", "fileencoding\tcharacter encoding for the current file") call append("$", "\t(local to buffer)")
call append("$", "\t(local to buffer)") call <SID>OptionL("fenc")
call <SID>OptionL("fenc") call append("$", "fileencodings\tautomatically detected character encodings")
call append("$", "fileencodings\tautomatically detected character encodings") call <SID>OptionG("fencs", &fencs)
call <SID>OptionG("fencs", &fencs) call append("$", "termencoding\tcharacter encoding used by the terminal")
call append("$", "termencoding\tcharacter encoding used by the terminal") call <SID>OptionG("tenc", &tenc)
call <SID>OptionG("tenc", &tenc) call append("$", "charconvert\texpression used for character encoding conversion")
call append("$", "charconvert\texpression used for character encoding conversion") call <SID>OptionG("ccv", &ccv)
call <SID>OptionG("ccv", &ccv) call append("$", "delcombine\tdelete combining (composing) characters on their own")
call append("$", "delcombine\tdelete combining (composing) characters on their own") call <SID>BinOptionG("deco", &deco)
call <SID>BinOptionG("deco", &deco) call append("$", "maxcombine\tmaximum number of combining (composing) characters displayed")
call append("$", "maxcombine\tmaximum number of combining (composing) characters displayed") call <SID>OptionG("mco", &mco)
call <SID>OptionG("mco", &mco) if has("xim") && has("gui_gtk")
if has("xim") && has("gui_gtk") call append("$", "imactivatekey\tkey that activates the X input method")
call append("$", "imactivatekey\tkey that activates the X input method") call <SID>OptionG("imak", &imak)
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)
endif 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") call <SID>Header("various")

2
src/version.c
View File

@ -779,6 +779,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
942,
/**/ /**/
941, 941,
/**/ /**/