aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/mbyte.c
diff options
context:
space:
mode:
authorMichael Reed <Pyrohh@users.noreply.github.com>2015-05-30 18:14:48 -0400
committerMichael Reed <Pyrohh@users.noreply.github.com>2015-05-30 18:14:48 -0400
commit8c84c124edf125ea7151488ccf8989a54e24da43 (patch)
tree8ab2ed80eca912d4656049bc0da00d7aa2da7e0c /src/nvim/mbyte.c
parent3dd3778f098ab33ced3ab3611ecaa600938cf82b (diff)
parentb113754de8815fd59e1b42f8eae239b0a31c43ee (diff)
downloadrneovim-8c84c124edf125ea7151488ccf8989a54e24da43.tar.gz
rneovim-8c84c124edf125ea7151488ccf8989a54e24da43.tar.bz2
rneovim-8c84c124edf125ea7151488ccf8989a54e24da43.zip
Merge pull request #2767 from Pyrohh/mainerr-simplify
[RDY] main.c: Some refactoring / cleanups Reviewed-by: Scott Prager <splinterofchaos@gmail.com> Reviewed-by: oni-link <knil.ino@gmail.com>
Diffstat (limited to 'src/nvim/mbyte.c')
-rw-r--r--src/nvim/mbyte.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nvim/mbyte.c b/src/nvim/mbyte.c
index 368ae8e773..c8ebcefe0e 100644
--- a/src/nvim/mbyte.c
+++ b/src/nvim/mbyte.c
@@ -3406,7 +3406,7 @@ char_u * enc_locale(void)
if (!(s = nl_langinfo(CODESET)) || *s == NUL)
# endif
{
-# if defined(HAVE_LOCALE_H) || defined(X_LOCALE)
+# if defined(HAVE_LOCALE_H)
if (!(s = setlocale(LC_CTYPE, NULL)) || *s == NUL)
# endif
{