Merge from origin/emacs-25

[gnu-emacs] / src / emacs.c

diff --git a/src/emacs.c b/src/emacs.c
index 540bf736feca39e627c680a666d56bb0e50b75d6..628b9be3131386c5070b769a65e668cb48a06c49 100644 (file)
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1315,6 +1315,11 @@ Using an Emacs configured with --with-x-toolkit=lucid does not have this problem
   init_ntproc (dumping); /* must precede init_editfns.  */
 #endif
 
+#ifdef HAVE_NS
+  /* Initialise the locale from user defaults. */
+  ns_init_locale();
+#endif
+
   /* Initialize and GC-protect Vinitial_environment and
      Vprocess_environment before set_initial_environment fills them
      in.  */