comparison runtime/optwin.vim @ 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 c017195b121b
children 54ffc82f38a8
comparison
equal deleted inserted replaced
15869:e362e5e887bc 15870:df0426d67bb3
683 call <SID>OptionG("pheader", &pheader) 683 call <SID>OptionG("pheader", &pheader)
684 if has("postscript") 684 if has("postscript")
685 call append("$", "printencoding\tencoding used to print the PostScript file for :hardcopy") 685 call append("$", "printencoding\tencoding used to print the PostScript file for :hardcopy")
686 call <SID>OptionG("penc", &penc) 686 call <SID>OptionG("penc", &penc)
687 endif 687 endif
688 if has("multi_byte") 688 call append("$", "printmbcharset\tthe CJK character set to be used for CJK output from :hardcopy")
689 call append("$", "printmbcharset\tthe CJK character set to be used for CJK output from :hardcopy") 689 call <SID>OptionG("pmbcs", &pmbcs)
690 call <SID>OptionG("pmbcs", &pmbcs) 690 call append("$", "printmbfont\tlist of font names to be used for CJK output from :hardcopy")
691 call append("$", "printmbfont\tlist of font names to be used for CJK output from :hardcopy") 691 call <SID>OptionG("pmbfn", &pmbfn)
692 call <SID>OptionG("pmbfn", &pmbfn)
693 endif
694 endif 692 endif
695 693
696 call <SID>Header("messages and info") 694 call <SID>Header("messages and info")
697 call append("$", "terse\tadd 's' flag in 'shortmess' (don't show search message)") 695 call append("$", "terse\tadd 's' flag in 'shortmess' (don't show search message)")
698 call <SID>BinOptionG("terse", &terse) 696 call <SID>BinOptionG("terse", &terse)
994 call append("$", "\t(local to buffer)") 992 call append("$", "\t(local to buffer)")
995 call <SID>BinOptionL("eol") 993 call <SID>BinOptionL("eol")
996 call append("$", "fixendofline\tfixes missing end-of-line at end of text file") 994 call append("$", "fixendofline\tfixes missing end-of-line at end of text file")
997 call append("$", "\t(local to buffer)") 995 call append("$", "\t(local to buffer)")
998 call <SID>BinOptionL("fixeol") 996 call <SID>BinOptionL("fixeol")
999 if has("multi_byte") 997 call append("$", "bomb\tprepend a Byte Order Mark to the file")
1000 call append("$", "bomb\tprepend a Byte Order Mark to the file") 998 call append("$", "\t(local to buffer)")
1001 call append("$", "\t(local to buffer)") 999 call <SID>BinOptionL("bomb")
1002 call <SID>BinOptionL("bomb")
1003 endif
1004 call append("$", "fileformat\tend-of-line format: \"dos\", \"unix\" or \"mac\"") 1000 call append("$", "fileformat\tend-of-line format: \"dos\", \"unix\" or \"mac\"")
1005 call append("$", "\t(local to buffer)") 1001 call append("$", "\t(local to buffer)")
1006 call <SID>OptionL("ff") 1002 call <SID>OptionL("ff")
1007 call append("$", "fileformats\tlist of file formats to look for when editing a file") 1003 call append("$", "fileformats\tlist of file formats to look for when editing a file")
1008 call <SID>OptionG("ffs", &ffs) 1004 call <SID>OptionG("ffs", &ffs)
1250 call append("$", "imactivatefunc\tfunction to enable/disable IME") 1246 call append("$", "imactivatefunc\tfunction to enable/disable IME")
1251 call <SID>OptionG("imaf", &imaf) 1247 call <SID>OptionG("imaf", &imaf)
1252 endif 1248 endif
1253 1249
1254 1250
1255 if has("multi_byte") 1251 call <SID>Header("multi-byte characters")
1256 call <SID>Header("multi-byte characters") 1252 call append("$", "encoding\tcharacter encoding used in Vim: \"latin1\", \"utf-8\"")
1257 call append("$", "encoding\tcharacter encoding used in Vim: \"latin1\", \"utf-8\"") 1253 call append("$", "\t\"euc-jp\", \"big5\", etc.")
1258 call append("$", "\t\"euc-jp\", \"big5\", etc.") 1254 call <SID>OptionG("enc", &enc)
1259 call <SID>OptionG("enc", &enc) 1255 call append("$", "fileencoding\tcharacter encoding for the current file")
1260 call append("$", "fileencoding\tcharacter encoding for the current file") 1256 call append("$", "\t(local to buffer)")
1261 call append("$", "\t(local to buffer)") 1257 call <SID>OptionL("fenc")
1262 call <SID>OptionL("fenc") 1258 call append("$", "fileencodings\tautomatically detected character encodings")
1263 call append("$", "fileencodings\tautomatically detected character encodings") 1259 call <SID>OptionG("fencs", &fencs)
1264 call <SID>OptionG("fencs", &fencs) 1260 call append("$", "termencoding\tcharacter encoding used by the terminal")
1265 call append("$", "termencoding\tcharacter encoding used by the terminal") 1261 call <SID>OptionG("tenc", &tenc)
1266 call <SID>OptionG("tenc", &tenc) 1262 call append("$", "charconvert\texpression used for character encoding conversion")
1267 call append("$", "charconvert\texpression used for character encoding conversion") 1263 call <SID>OptionG("ccv", &ccv)
1268 call <SID>OptionG("ccv", &ccv) 1264 call append("$", "delcombine\tdelete combining (composing) characters on their own")
1269 call append("$", "delcombine\tdelete combining (composing) characters on their own") 1265 call <SID>BinOptionG("deco", &deco)
1270 call <SID>BinOptionG("deco", &deco) 1266 call append("$", "maxcombine\tmaximum number of combining (composing) characters displayed")
1271 call append("$", "maxcombine\tmaximum number of combining (composing) characters displayed") 1267 call <SID>OptionG("mco", &mco)
1272 call <SID>OptionG("mco", &mco) 1268 if has("xim") && has("gui_gtk")
1273 if has("xim") && has("gui_gtk") 1269 call append("$", "imactivatekey\tkey that activates the X input method")
1274 call append("$", "imactivatekey\tkey that activates the X input method") 1270 call <SID>OptionG("imak", &imak)
1275 call <SID>OptionG("imak", &imak) 1271 endif
1276 endif 1272 call append("$", "ambiwidth\twidth of ambiguous width characters")
1277 call append("$", "ambiwidth\twidth of ambiguous width characters") 1273 call <SID>OptionG("ambw", &ambw)
1278 call <SID>OptionG("ambw", &ambw) 1274 call append("$", "emoji\temoji characters are full width")
1279 call append("$", "emoji\temoji characters are full width") 1275 call <SID>BinOptionG("emo", &emo)
1280 call <SID>BinOptionG("emo", &emo)
1281 endif
1282 1276
1283 1277
1284 call <SID>Header("various") 1278 call <SID>Header("various")
1285 call append("$", "virtualedit\twhen to use virtual editing: \"block\", \"insert\" and/or \"all\"") 1279 call append("$", "virtualedit\twhen to use virtual editing: \"block\", \"insert\" and/or \"all\"")
1286 call <SID>OptionG("ve", &ve) 1280 call <SID>OptionG("ve", &ve)