aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/mbyte.c
diff options
context:
space:
mode:
authorBjörn Linse <bjorn.linse@gmail.com>2015-11-10 22:44:41 +0100
committerBjörn Linse <bjorn.linse@gmail.com>2016-01-02 23:15:53 +0100
commit49b06a8f2a12f6553ad384032e108e351767ac1d (patch)
treee4b828d04eec51990431fb51ad4b25f432760f45 /src/nvim/mbyte.c
parentcb625940422ddfb25fdb9a6dc6c6a26a56a228e8 (diff)
downloadrneovim-49b06a8f2a12f6553ad384032e108e351767ac1d.tar.gz
rneovim-49b06a8f2a12f6553ad384032e108e351767ac1d.tar.bz2
rneovim-49b06a8f2a12f6553ad384032e108e351767ac1d.zip
encoding: Always use "utf-8" as default for &encoding
Preverve the locale-depedency for fileencodings=default
Diffstat (limited to 'src/nvim/mbyte.c')
-rw-r--r--src/nvim/mbyte.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/nvim/mbyte.c b/src/nvim/mbyte.c
index b02c18c53b..44e30c1e7e 100644
--- a/src/nvim/mbyte.c
+++ b/src/nvim/mbyte.c
@@ -2417,11 +2417,8 @@ char_u *enc_canonize(char_u *enc) FUNC_ATTR_NONNULL_RET
int i;
if (STRCMP(enc, "default") == 0) {
- /* Use the default encoding as it's found by set_init_1(). */
- char_u *r = get_encoding_default();
- if (r == NULL)
- r = (char_u *)"latin1";
- return vim_strsave(r);
+ // Use the default encoding as found by set_init_1().
+ return vim_strsave(fenc_default);
}
/* copy "enc" to allocated memory, with room for two '-' */