1 files changed, 5 insertions, 2 deletions
diff --git a/src/nvim/option.c b/src/nvim/option.c
index cde740daf1..311982982b 100644
--- a/src/nvim/option.c
+++ b/src/nvim/option.c
@@ -780,8 +780,11 @@ void set_init_1(void)
   }
   fenc_default = p;
 
-  // Initialize multibyte (utf-8) handling
-  mb_init();
+#ifdef HAVE_WORKING_LIBINTL
+  // GNU gettext 0.10.37 supports this feature: set the codeset used for
+  // translated messages independently from the current locale.
+  (void)bind_textdomain_codeset(PROJECT_NAME, (char *)p_enc);
+#endif
 
   /* Set the default for 'helplang'. */
   set_helplang_default(get_mess_lang());