commit fc3abf47fbe1e426f2b676c316c81ee9ff607075
author Bram Moolenaar <Bram@vim.org> Thu Jan 24 15:54:21 2019 +0100
committer Bram Moolenaar <Bram@vim.org> Thu Jan 24 15:54:21 2019 +0100
tree 87b9be7b053e71ee6ec750f7c0f0387e9287d4c0
parent 135059724f140ceac889c9f8136bd1bf5c41d49d

patch 8.1.0806: too many #ifdefs

Problem:    Too many #ifdefs.
Solution:   Graduate FEAT_MBYTE, part 2.

src/ex_cmds2.c

diff --git a/src/ex_cmds2.c b/src/ex_cmds2.c
index 60af27c..30efcdf 100644
--- a/src/ex_cmds2.c
+++ b/src/ex_cmds2.c
@@ -5421,7 +5421,6 @@
 #if (defined(FEAT_EVAL) && !((defined(HAVE_LOCALE_H) || defined(X_LOCALE)) \
 	    && defined(LC_MESSAGES))) \
 	|| ((defined(HAVE_LOCALE_H) || defined(X_LOCALE)) \
-		&& (defined(FEAT_GETTEXT) || defined(FEAT_MBYTE)) \
 		&& !defined(LC_MESSAGES))
 /*
  * Get the language used for messages from the environment.
@@ -5485,8 +5484,7 @@
 }
 #endif
 
-#if (defined(HAVE_LOCALE_H) || defined(X_LOCALE)) \
-	&& (defined(FEAT_GETTEXT) || defined(FEAT_MBYTE))
+#if defined(HAVE_LOCALE_H) || defined(X_LOCALE) \
 /*
  * ":language":  Set the language (locale).
  */