[Emacs-diffs] trunk r115425: * emacs.c (main): Call fixup_locale a second time for GNUStep.

[Jan D.]

------------------------------------------------------------
revno: 115425
revision-id: address@hidden
parent: address@hidden
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Sun 2013-12-08 13:18:13 +0100
message:
  * emacs.c (main): Call fixup_locale a second time for GNUStep.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/emacs.c                    emacs.c-20091113204419-o5vbwnq5f7feedwu-241

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-12-08 09:56:02 +0000
+++ b/src/ChangeLog     2013-12-08 12:18:13 +0000
@@ -1,3 +1,7 @@
+2013-12-08  Jan Djärv  <address@hidden>
+
+       * emacs.c (main): Call fixup_locale a second time for GNUStep.
+
 2013-12-08  Martin Rudalics  <address@hidden>
 
        * frame.c (x_set_font): Mark frame as garbaged (Bug#16028).

=== modified file 'src/emacs.c'
--- a/src/emacs.c       2013-11-28 19:40:15 +0000
+++ b/src/emacs.c       2013-12-08 12:18:13 +0000
@@ -1195,6 +1195,11 @@
 
 #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