IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

set_init_1: mb_init() on fallback encoding (utf8) #2106

Browse Source 
Explanation:
  Running `:set encoding=utf-8` _after_ startup correctly initializes
  multibyte; but mb_init() was _not_ called during startup if locale
  detection (enc_locale()) failed. This wasn't a problem in Vim because
  the Vim default encoding (latin1) does not require mb_init(). But Nvim
  defaults to utf8, so mb_init() is required.

closes #1271
closes #1672
This commit is contained in:
Floris van Liere 2015-03-07 14:06:37 +01:00 committed by Justin M. Keyes
parent 85f5115723
commit 57811dec95
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/nvim/option.c
View File

@ -1989,7 +1989,7 @@ void set_init_1(void)
char_u *save_enc; char_u *save_enc;
/* Try setting 'encoding' and check if the value is valid. /* Try setting 'encoding' and check if the value is valid.
* If not, go back to the default "latin1". */ * If not, go back to the default "utf-8". */
save_enc = p_enc; save_enc = p_enc;
p_enc = p; p_enc = p;
if (STRCMP(p_enc, "gb18030") == 0) { if (STRCMP(p_enc, "gb18030") == 0) {
@ -2029,8 +2029,13 @@ void set_init_1(void)
} else { } else {
free(p_enc); free(p_enc);
// mb_init() failed; fallback to utf8 and try again.
p_enc = save_enc; p_enc = save_enc;
mb_init();
} }
} else {
// enc_locale() failed; initialize the default (utf8).
mb_init();
} }
/* Set the default for 'helplang'. */ /* Set the default for 'helplang'. */