diff options
| -rw-r--r-- | runtime/doc/mbyte.txt | 69 | ||||
| -rw-r--r-- | runtime/doc/options.txt | 35 | ||||
| -rw-r--r-- | runtime/doc/quickref.txt | 1 | ||||
| -rw-r--r-- | runtime/doc/usr_45.txt | 27 | ||||
| -rw-r--r-- | runtime/doc/vim_diff.txt | 1 | ||||
| -rw-r--r-- | runtime/optwin.vim | 2 | ||||
| -rw-r--r-- | runtime/syntax/vim.vim | 4 | ||||
| -rw-r--r-- | src/nvim/globals.h | 5 | ||||
| -rw-r--r-- | src/nvim/mbyte.c | 18 | ||||
| -rw-r--r-- | src/nvim/option.c | 12 | ||||
| -rw-r--r-- | src/nvim/option_defs.h | 1 | ||||
| -rw-r--r-- | src/nvim/po/zh_TW.UTF-8.po | 1 | ||||
| -rw-r--r-- | src/nvim/po/zh_TW.po | 1 | ||||
| -rw-r--r-- | test/functional/legacy/044_099_regexp_multibyte_magic_spec.lua | 2 |
14 files changed, 14 insertions, 165 deletions
diff --git a/runtime/doc/mbyte.txt b/runtime/doc/mbyte.txt index 2a5ccc626e..8189ec5b38 100644 --- a/runtime/doc/mbyte.txt +++ b/runtime/doc/mbyte.txt @@ -100,8 +100,7 @@ See 'fileencoding', 'fileencodings' and |++enc|. DISPLAY AND FONTS If you are working in a terminal (emulator) you must make sure it accepts the -same encoding as which Vim is working with. If this is not the case, you can -use the 'termencoding' option to make Vim convert text automatically. +same encoding as which Vim is working with. For the GUI you must select fonts that work with the current 'encoding'. This is the difficult part. It depends on the system you are using, the locale and @@ -379,62 +378,11 @@ or when conversion is not possible: cp932, shift-jis, sjis cp936, euc-cn - *encoding-table* -Normally 'encoding' is equal to your current locale and 'termencoding' is -empty. This means that your keyboard and display work with characters encoded -in your current locale, and Vim uses the same characters internally. - -You can make Vim use characters in a different encoding by setting the -'encoding' option to a different value. Since the keyboard and display still -use the current locale, conversion needs to be done. The 'termencoding' then -takes over the value of the current locale, so Vim converts between 'encoding' -and 'termencoding'. Example: > - :let &termencoding = &encoding - :set encoding=utf-8 - -However, not all combinations of values are possible. The table below tells -you how each of the nine combinations works. This is further restricted by -not all conversions being possible, iconv() being present, etc. Since this -depends on the system used, no detailed list can be given. - -('tenc' is the short name for 'termencoding' and 'enc' short for 'encoding') - -'tenc' 'enc' remark ~ - - 8bit 8bit Works. When 'termencoding' is different from - 'encoding' typing and displaying may be wrong for some - characters, Vim does NOT perform conversion (set - 'encoding' to "utf-8" to get this). - 8bit 2byte MS-Windows: works for all codepages installed on your - system; you can only type 8bit characters; - Other systems: does NOT work. - 8bit Unicode Works, but only 8bit characters can be typed directly - (others through digraphs, keymaps, etc.); in a - terminal you can only see 8bit characters; the GUI can - show all characters that the 'guifont' supports. - - 2byte 8bit Works, but typing non-ASCII characters might - be a problem. - 2byte 2byte MS-Windows: works for all codepages installed on your - system; typing characters might be a problem when - locale is different from 'encoding'. - Other systems: Only works when 'termencoding' is equal - to 'encoding', you might as well leave it empty. - 2byte Unicode works, Vim will translate typed characters. - - Unicode 8bit works (unusual) - Unicode 2byte does NOT work - Unicode Unicode works very well (leaving 'termencoding' empty works - the same way, because all Unicode is handled - internally as UTF-8) - CONVERSION *charset-conversion* Vim will automatically convert from one to another encoding in several places: - When reading a file and 'fileencoding' is different from 'encoding' - When writing a file and 'fileencoding' is different from 'encoding' -- When displaying characters and 'termencoding' is different from 'encoding' -- When reading input and 'termencoding' is different from 'encoding' - When displaying messages and the encoding used for LC_MESSAGES differs from 'encoding' (requires a gettext version that supports this). - When reading a Vim script where |:scriptencoding| is different from @@ -507,17 +455,6 @@ For example, you can run Vim in a xterm with added multi-byte support and/or |XIM|. Examples are kterm (Kanji term) and hanterm (for Korean), Eterm (Enlightened terminal) and rxvt. -If your terminal does not support the right encoding, you can set the -'termencoding' option. Vim will then convert the typed characters from -'termencoding' to 'encoding'. And displayed text will be converted from -'encoding' to 'termencoding'. If the encoding supported by the terminal -doesn't include all the characters that Vim uses, this leads to lost -characters. This may mess up the display. If you use a terminal that -supports Unicode, such as the xterm mentioned below, it should work just fine, -since nearly every character set can be converted to Unicode without loss of -information. - - UTF-8 IN XFREE86 XTERM *UTF8-xterm* This is a short explanation of how to use UTF-8 character encoding in the @@ -1368,10 +1305,6 @@ If your system does not provide support for typing utf-8, you can use the 'keymap' feature. This allows writing a keymap file, which defines a utf-8 character as a sequence of ASCII characters. See |mbyte-keymap|. -Another method is to set the current locale to the language you want to use -and for which you have a XIM available. Then set 'termencoding' to that -language and Vim will convert the typed characters to 'encoding' for you. - If everything else fails, you can type any character as four hex bytes: > CTRL-V u 1234 diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index 9aeeaec46a..46f93d4ea0 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -2323,9 +2323,7 @@ A jump table for the options with a short description can be found at |Q_op|. if has("multi_byte_encoding") < Normally 'encoding' will be equal to your current locale. This will - be the default if Vim recognizes your environment settings. If - 'encoding' is not set to the current locale, 'termencoding' must be - set to convert typed and displayed text. See |encoding-table|. + be the default if Vim recognizes your environment settings. When you set this option, it fires the |EncodingChanged| autocommand event so that you can set up fonts if necessary. @@ -6569,36 +6567,7 @@ A jump table for the options with a short description can be found at |Q_op|. For further details see |arabic.txt|. *'termencoding'* *'tenc'* -'termencoding' 'tenc' string (default ""; with GTK+ 2 GUI: "utf-8"; with - Macintosh GUI: "macroman") - global - {only available when compiled with the |+multi_byte| - feature} - Encoding used for the terminal. This specifies what character - encoding the keyboard produces and the display will understand. For - the GUI it only applies to the keyboard ( 'encoding' is used for the - display). - In the Win32 console version the default value is the console codepage - when it differs from the ANSI codepage. - *E617* - Note: This does not apply to the GTK+ 2 GUI. After the GUI has been - successfully initialized, 'termencoding' is forcibly set to "utf-8". - Any attempts to set a different value will be rejected, and an error - message is shown. - For the Win32 GUI 'termencoding' is not used for typed characters, - because the Win32 system always passes Unicode characters. - When empty, the same encoding is used as for the 'encoding' option. - This is the normal value. - Not all combinations for 'termencoding' and 'encoding' are valid. See - |encoding-table|. - The value for this option must be supported by internal conversions or - iconv(). When this is not possible no conversion will be done and you - will probably experience problems with non-ASCII characters. - Example: You are working with the locale set to euc-jp (Japanese) and - want to edit a UTF-8 file: > - :let &termencoding = &encoding - :set encoding=utf-8 -< You need to do this when your system has no locale support for UTF-8. +'termencoding' 'tenc' Removed. |vim-differences| {Nvim} *'terse'* *'noterse'* 'terse' boolean (default off) diff --git a/runtime/doc/quickref.txt b/runtime/doc/quickref.txt index 0e53099c5d..5daeb15c00 100644 --- a/runtime/doc/quickref.txt +++ b/runtime/doc/quickref.txt @@ -888,7 +888,6 @@ Short explanation of each option: *option-list* 'tagstack' 'tgst' push tags onto the tag stack 'term' name of the terminal 'termbidi' 'tbidi' terminal takes care of bi-directionality -'termencoding' 'tenc' character encoding used by the terminal 'terse' shorten some messages 'textwidth' 'tw' maximum width of text that is being inserted 'thesaurus' 'tsr' list of thesaurus files for keyword completion diff --git a/runtime/doc/usr_45.txt b/runtime/doc/usr_45.txt index 828ea6fe2d..3ba2d47cd0 100644 --- a/runtime/doc/usr_45.txt +++ b/runtime/doc/usr_45.txt @@ -198,19 +198,7 @@ you can find it here: http://www.microsoft.com/typography/fonts/default.aspx ~ Now you have told Vim to use Unicode internally and display text with a -Unicode font. Typed characters still arrive in the encoding of your original -language. This requires converting them to Unicode. Tell Vim the language -from which to convert with the 'termencoding' option. You can do it like -this: > - - :let &termencoding = &encoding - :set encoding=utf-8 - -This assigns the old value of 'encoding' to 'termencoding' before setting -'encoding' to utf-8. You will have to try out if this really works for your -setup. It should work especially well when using an input method for an Asian -language, and you want to edit Unicode text. - +Unicode font. USING UNICODE IN A UNICODE TERMINAL @@ -232,18 +220,9 @@ USING UNICODE IN AN ORDINARY TERMINAL Suppose you want to work with Unicode files, but don't have a terminal with Unicode support. You can do this with Vim, although characters that are not supported by the terminal will not be displayed. The layout of the text -will be preserved. > - - :let &termencoding = &encoding - :set encoding=utf-8 +will be preserved. -This is the same as what was used for the GUI. But it works differently: Vim -will convert the displayed text before sending it to the terminal. That -avoids that the display is messed up with strange characters. - For this to work the conversion between 'termencoding' and 'encoding' must -be possible. Vim will convert from latin1 to Unicode, thus that always works. -For other conversions the |+iconv| feature is required. - Try editing a file with Unicode characters in it. You will notice that Vim +Try editing a file with Unicode characters in it. You will notice that Vim will put a question mark (or underscore or some other character) in places where a character should be that the terminal can't display. Move the cursor to a question mark and use this command: > diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt index 20653f03bc..ac32c9d52c 100644 --- a/runtime/doc/vim_diff.txt +++ b/runtime/doc/vim_diff.txt @@ -115,6 +115,7 @@ Other options: 'macatsui' 'shortname' 'shelltype' + 'termencoding' 'textauto' 'textmode' diff --git a/runtime/optwin.vim b/runtime/optwin.vim index 8a9fb72f3d..986d445b30 100644 --- a/runtime/optwin.vim +++ b/runtime/optwin.vim @@ -1180,8 +1180,6 @@ if has("multi_byte") 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") diff --git a/runtime/syntax/vim.vim b/runtime/syntax/vim.vim index 3e5bf5ff59..57a609e917 100644 --- a/runtime/syntax/vim.vim +++ b/runtime/syntax/vim.vim @@ -27,11 +27,11 @@ syn match vimCommand contained "\<z[-+^.=]\=" syn keyword vimStdPlugin contained DiffOrig Man N[ext] P[rint] S TOhtml XMLent XMLns " vimOptions are caught only when contained in a vimSet {{{2 -syn keyword vimOption contained acd ambiwidth arabicshape autowriteall backupdir bdlay binary breakat bufhidden cd ci cinw co commentstring confirm cpoptions cscoperelative csre cursorcolumn delcombine diffopt ea efm ep et fdc fdo ffs filetype fo foldlevelstart formatexpr ft gfw gtt guipty hh hkmap ic imaf iminsert includeexpr inf isident langmap lines lmap ma matchtime mco ml modeline mousefocus mousetime nrformats ofu para pdev pi previewwindow printmbfont qe relativenumber rightleftcmd ru sbr scrolloff selection shellcmdflag shellxescape showbreak si smartcase softtabstop spelllang sps sta su swb synmaxcol tagbsearch termencoding thesaurus titlestring tpm ttm ttytype undodir ut vfile vop wcm whichwrap wildignore winaltkeys winminwidth wmnu write +syn keyword vimOption contained acd ambiwidth arabicshape autowriteall backupdir bdlay binary breakat bufhidden cd ci cinw co commentstring confirm cpoptions cscoperelative csre cursorcolumn delcombine diffopt ea efm ep et fdc fdo ffs filetype fo foldlevelstart formatexpr ft gfw gtt guipty hh hkmap ic imaf iminsert includeexpr inf isident langmap lines lmap ma matchtime mco ml modeline mousefocus mousetime nrformats ofu para pdev pi previewwindow printmbfont qe relativenumber rightleftcmd ru sbr scrolloff selection shellcmdflag shellxescape showbreak si smartcase softtabstop spelllang sps sta su swb synmaxcol tagbsearch thesaurus titlestring tpm ttm ttytype undodir ut vfile vop wcm whichwrap wildignore winaltkeys winminwidth wmnu write syn keyword vimOption contained ai ambw ari aw backupext beval brk buflisted cdpath cin cinwords cocu compatible cpt cscopetag cst cursorline dex digraph ead ei equalalways eventignore fde fdt fic fillchars foldclose foldmarker formatlistpat gcr ghr guicursor guitablabel hi hkmapp icon imak ims incsearch infercase isk keymap langmenu linespace loadplugins maxcombine mef mls modelines mousehide mp nu omnifunc paragraphs penc pm printdevice printoptions quoteescape remap rl ruf sc scrollopt selectmode shellpipe shellxquote showcmd sidescroll smartindent sol spellsuggest sr stal sua swf syntax taglength tbidi terse tildeop tl tr tty tw undofile vb vi wa wd wi wildignorecase window winwidth wmw writeany syn keyword vimOption contained akm anti arshape awa backupskip bex browsedir buftype cedit cindent clipboard cole complete crb cscopetagorder csto cwh dg dip eadirection ek equalprg ex fdi fen fileencoding fk foldcolumn foldmethod formatoptions gd go guifont guitabtooltip hid hkp iconstring imc imsearch inde insertmode iskeyword keymodel laststatus lisp lpl magic maxfuncdepth menuitems mm modifiable mousem mps number opendevice paste pex pmbcs printencoding prompt rdt report rlc ruler scb scs sessionoptions shellquote shiftround showfulltag sidescrolloff smarttab sp spf srr startofline suffixes switchbuf ta tagrelative tbis textauto timeout tm ts tx undolevels vbs viewdir wak weirdinvert wic wildmenu winfixheight wiv wop writebackup syn keyword vimOption contained al antialias autochdir background balloondelay bexpr bk bs casemap cf cink cmdheight colorcolumn completefunc copyindent cscopeverbose csverb debug dict dir eb enc errorbells expandtab fdl fenc fileencodings fkmap foldenable foldminlines formatprg gdefault gp guifontset helpfile hidden hl ignorecase imcmdline imsf indentexpr is isp keywordprg lazyredraw lispwords ls makeef maxmapdepth mfd mmd modified mousemodel msm numberwidth operatorfunc pastetoggle pexpr pmbfn printexpr pt re restorescreen rnu rulerformat scr sect sft shellredir shiftwidth showmatch siso smc spc spl ss statusline suffixesadd sws tabline tags tbs textmode timeoutlen to tsl uc undoreload vdir viewoptions warn wfh wig wildmode winfixwidth wiw wrap writedelay -syn keyword vimOption contained aleph ar autoindent backspace ballooneval bg bkc bsdir cb cfu cinkeys cmdwinheight columns completeopt cot cscopepathcomp cspc cuc deco dictionary directory ed encoding errorfile exrc fdls fencs fileformat flp foldexpr foldnestmax fp gfm grepformat guifontwide helpheight highlight hlg im imd imstatusfunc indentkeys isf isprint km lbr list lsp makeprg maxmem mh mmp more mouses nuw opfunc patchexpr pfn popt printfont pumheight readonly revins ro runtimepath scroll sections sh shellslash shm showmode sj smd spell splitbelow ssl stl sw sxe tabpagemax tagstack tenc textwidth title toolbar tsr ttym udf updatecount ve viminfo wb wfw wildchar wildoptions winheight wm wrapmargin ws +syn keyword vimOption contained aleph ar autoindent backspace ballooneval bg bkc bsdir cb cfu cinkeys cmdwinheight columns completeopt cot cscopepathcomp cspc cuc deco dictionary directory ed encoding errorfile exrc fdls fencs fileformat flp foldexpr foldnestmax fp gfm grepformat guifontwide helpheight highlight hlg im imd imstatusfunc indentkeys isf isprint km lbr list lsp makeprg maxmem mh mmp more mouses nuw opfunc patchexpr pfn popt printfont pumheight readonly revins ro runtimepath scroll sections sh shellslash shm showmode sj smd spell splitbelow ssl stl sw sxe tabpagemax tagstack textwidth title toolbar tsr ttym udf updatecount ve viminfo wb wfw wildchar wildoptions winheight wm wrapmargin ws syn keyword vimOption contained allowrevins arab autoread backup balloonexpr bh bl bsk cc ch cino cmp com concealcursor cp cscopeprg csprg cul def diff display endofline errorformat fcl fdm fex fileformats fml foldignore foldopen fs gfn grepprg guiheadroom helplang history hls imactivatefunc imdisable inc indk isfname joinspaces kmp lcs listchars lw mat maxmempattern mis mmt mouse mouseshape odev patchmode ph preserveindent printheader pvh redrawtime ri rs sb scrollbind secure shcf shelltemp shortmess showtabline slm spellcapcheck splitright ssop stmp swapfile sxq tabstop tal term titlelen toolbariconsize ttimeout ttymouse udir updatetime verbose virtualedit wc wh wildcharm wim winminheight wmh wrapscan ww syn keyword vimOption contained altkeymap arabic autowrite backupcopy bdir bin bomb bt ccv charconvert cinoptions cms comments conceallevel cpo cscopequickfix csqf cursorbind define diffexpr dy ef eol esckeys fcs fdn ff fileignorecase fmr foldlevel foldtext fsync gfs gtl guioptions hf hk hlsearch imactivatekey imi include inex isi js kp linebreak lm lz matchpairs maxmemtot mkspellmem mod mousef mouset nf pa path pheader previewheight printmbcharset pvw regexpengine rightleft rtp sbo scrolljump sel shell shq sm so spellfile spr st sts swapsync syn tag tb termbidi tgst titleold top ttimeoutlen ttyscroll ul ur unnamedclip unc verbosefile visualbell diff --git a/src/nvim/globals.h b/src/nvim/globals.h index b9a1916ef2..1d93900a94 100644 --- a/src/nvim/globals.h +++ b/src/nvim/globals.h @@ -753,11 +753,6 @@ EXTERN int has_mbyte INIT(= 0); /* any multi-byte encoding */ */ EXTERN char mb_bytelen_tab[256]; -/* Variables that tell what conversion is used for keyboard input and display - * output. */ -EXTERN vimconv_T input_conv; /* type of input conversion */ -EXTERN vimconv_T output_conv; /* type of output conversion */ - /* * Function pointers, used to quickly get to the right function. Each has * three possible values: latin_ (8-bit), utfc_ or utf_ (utf-8) and dbcs_ diff --git a/src/nvim/mbyte.c b/src/nvim/mbyte.c index 71d2ceb037..b6e08ab277 100644 --- a/src/nvim/mbyte.c +++ b/src/nvim/mbyte.c @@ -58,16 +58,11 @@ * V * file * - * (1) Typed characters arrive in the current locale. Conversion is to be - * done when 'encoding' is different from 'termencoding'. + * (1) Typed characters arrive in the current locale. * (2) Text will be made available with the encoding specified with * 'encoding'. If this is not sufficient, system-specific conversion * might be required. * (3) For the GUI the correct font must be selected, no conversion done. - * Otherwise, conversion is to be done when 'encoding' differs from - * 'termencoding'. (Different in the GTK+ 2 port -- 'termencoding' - * is always used for both input and output and must always be set to - * "utf-8". gui_mch_init() does this automatically.) * (4) The encoding of the file is specified with 'fileencoding'. Conversion * is to be done when it's different from 'encoding'. * @@ -426,9 +421,6 @@ char_u * mb_init(void) /* Just starting up: set the whole table to one's. */ for (i = 0; i < 256; ++i) mb_bytelen_tab[i] = 1; - input_conv.vc_type = CONV_NONE; - input_conv.vc_factor = 1; - output_conv.vc_type = CONV_NONE; return NULL; } else if (STRNCMP(p_enc, "8bit-", 5) == 0 || STRNCMP(p_enc, "iso-8859-", 9) == 0) { @@ -3701,12 +3693,6 @@ bool iconv_enabled(bool verbose) void iconv_end(void) { - /* Don't use iconv() when inputting or outputting characters. */ - if (input_conv.vc_type == CONV_ICONV) - convert_setup(&input_conv, NULL, NULL); - if (output_conv.vc_type == CONV_ICONV) - convert_setup(&output_conv, NULL, NULL); - if (hIconvDLL != 0) FreeLibrary(hIconvDLL); if (hMsvcrtDLL != 0) @@ -3942,7 +3928,7 @@ char_u * string_convert_ext(vimconv_T *vcp, char_u *ptr, break; # ifdef USE_ICONV - case CONV_ICONV: /* conversion with output_conv.vc_fd */ + case CONV_ICONV: /* conversion with vcp->vc_fd */ retval = iconv_string(vcp, ptr, len, unconvlenp, lenp); break; # endif diff --git a/src/nvim/option.c b/src/nvim/option.c index 91c8493419..9201f7b6c4 100644 --- a/src/nvim/option.c +++ b/src/nvim/option.c @@ -1501,7 +1501,7 @@ static vimoption_T (char_u *)&p_tbidi, PV_NONE, {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"termencoding", "tenc", P_STRING|P_VI_DEF|P_RCLR, - (char_u *)&p_tenc, PV_NONE, + (char_u *)NULL, PV_NONE, {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, {"terse", NULL, P_BOOL|P_VI_DEF, @@ -3705,7 +3705,7 @@ did_set_string_option ( errmsg = e_invarg; } /* 'encoding' and 'fileencoding' */ - else if (varp == &p_enc || gvarp == &p_fenc || varp == &p_tenc) { + else if (varp == &p_enc || gvarp == &p_fenc) { if (gvarp == &p_fenc) { if (!MODIFIABLE(curbuf) && opt_flags != OPT_GLOBAL) errmsg = e_modifiable; @@ -3738,14 +3738,6 @@ did_set_string_option ( if (varp == &p_enc && *curbuf->b_p_keymap != NUL) (void)keymap_init(); - /* When 'termencoding' is not empty and 'encoding' changes or when - * 'termencoding' changes, need to setup for keyboard input and - * display output conversion. */ - if (((varp == &p_enc && *p_tenc != NUL) || varp == &p_tenc)) { - convert_setup(&input_conv, p_tenc, p_enc); - convert_setup(&output_conv, p_enc, p_tenc); - } - } } else if (varp == &p_penc) { /* Canonize printencoding if VIM standard one */ diff --git a/src/nvim/option_defs.h b/src/nvim/option_defs.h index daecfcdb8b..96824fdccf 100644 --- a/src/nvim/option_defs.h +++ b/src/nvim/option_defs.h @@ -553,7 +553,6 @@ EXTERN int p_tr; /* 'tagrelative' */ EXTERN char_u *p_tags; /* 'tags' */ EXTERN int p_tgst; /* 'tagstack' */ EXTERN int p_tbidi; /* 'termbidi' */ -EXTERN char_u *p_tenc; /* 'termencoding' */ EXTERN int p_terse; /* 'terse' */ EXTERN int p_to; /* 'tildeop' */ EXTERN int p_timeout; /* 'timeout' */ diff --git a/src/nvim/po/zh_TW.UTF-8.po b/src/nvim/po/zh_TW.UTF-8.po index 627389d8bf..79e09c83d1 100644 --- a/src/nvim/po/zh_TW.UTF-8.po +++ b/src/nvim/po/zh_TW.UTF-8.po @@ -35,7 +35,6 @@ # A. A simple configuration: # set encoding=utf-8; let $LANG='zh_TW.UTF-8'; # (set langmenu=none or ..) -# set termencoding=utf-8 # set fileencodings=ucs-bom,utf-8,japan,taiwan,prc # set fileencoding=taiwan (or utf-8) # diff --git a/src/nvim/po/zh_TW.po b/src/nvim/po/zh_TW.po index 9a7e6bf488..07d510c0c6 100644 --- a/src/nvim/po/zh_TW.po +++ b/src/nvim/po/zh_TW.po @@ -27,7 +27,6 @@ # A. A simple configuration: # set encoding=utf-8; let $LANG='zh_TW.UTF-8'; # (set langmenu=none or ..) -# set termencoding=utf-8 # set fileencodings=ucs-bom,utf-8,japan,taiwan,prc # set fileencoding=taiwan (or utf-8) # diff --git a/test/functional/legacy/044_099_regexp_multibyte_magic_spec.lua b/test/functional/legacy/044_099_regexp_multibyte_magic_spec.lua index de628b0b52..58838e9d6e 100644 --- a/test/functional/legacy/044_099_regexp_multibyte_magic_spec.lua +++ b/test/functional/legacy/044_099_regexp_multibyte_magic_spec.lua @@ -33,7 +33,7 @@ local function run_test_with_regexpengine(regexpengine) j 0123❤x k combinations]]) - execute('set encoding=utf-8 termencoding=latin1') + execute('set encoding=utf-8') execute('set re=' .. regexpengine) -- Lines 1-8. Exercise regexp search with various magic settings. On each |