2 files changed, 9 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 02be1e9bd64..5711b356f61 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2013-12-08  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * emacs.c (main): Call fixup_locale a second time for GNUStep.
+
 2013-12-08  Martin Rudalics  <rudalics@gmx.at>
 
         * frame.c (x_set_font): Mark frame as garbaged (Bug#16028).
diff --git a/src/emacs.c b/src/emacs.c
index 159b0d5040d..3243c38a87a 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1195,6 +1195,11 @@ Using an Emacs configured with --with-x-toolkit=lucid does not have this problem
 
 #ifdef HAVE_NS
   ns_pool = ns_alloc_autorelease_pool ();
+#ifdef NS_IMPL_GNUSTEP
+  /* GNUStep stupidly resets our locale settings after we made them.  */
+  fixup_locale ();
+#endif
+
   if (!noninteractive)
     {
 #ifdef NS_IMPL_COCOA