[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 26d890c: Propagate NSLocale into Emacs better
From: |
Paul Eggert |
Subject: |
master 26d890c: Propagate NSLocale into Emacs better |
Date: |
Sun, 26 Jan 2020 03:34:43 -0500 (EST) |
branch: master
commit 26d890c9ccb1e95f5451432bb6bb764b590b165e
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>
Propagate NSLocale into Emacs better
* src/emacs.c (main): Call ns_init_locale before using the
environment variable that ns_init_locale sets up (Bug#39248).
---
src/emacs.c | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/src/emacs.c b/src/emacs.c
index 4b5d00a..c170333 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1242,6 +1242,9 @@ main (int argc, char **argv)
char *lc_all = getenv ("LC_ALL");
if (! (lc_all && strcmp (lc_all, "C") == 0))
{
+ #ifdef HAVE_NS
+ ns_init_locale ();
+ #endif
setlocale (LC_ALL, "");
fixup_locale ();
}
@@ -1610,10 +1613,6 @@ 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)
{
@@ -1724,11 +1723,6 @@ Using an Emacs configured with --with-x-toolkit=lucid
does not have this problem
globals_of_gfilenotify ();
#endif
-#ifdef HAVE_NS
- /* Initialize 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. */
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master 26d890c: Propagate NSLocale into Emacs better,
Paul Eggert <=