From 34859e1fe9959778b964c9de457f192c5e369705 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Courr=C3=A8ges-Anglas?= Date: Sun, 17 Sep 2017 20:01:15 +0200 Subject: Initialize utf8_locale in main(), it doesn't belong in defaults now --- src/main.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/main.c b/src/main.c index af1bc7d..fa49784 100644 --- a/src/main.c +++ b/src/main.c @@ -267,12 +267,6 @@ init_defaults (void) set_extents_of_fontset (defaults.font); #endif -#ifdef HAVE_LANGINFO_CODESET - utf8_locale = !strcmp (nl_langinfo (CODESET), "UTF-8"); -#endif - PRINT_DEBUG (("UTF-8 locale detected: %s\n", - utf8_locale ? "yes" : "no")); - defaults.fgcolor_string = xstrdup ("black"); defaults.bgcolor_string = xstrdup ("white"); defaults.fwcolor_string = xstrdup ("black"); @@ -315,6 +309,10 @@ main (int argc, char *argv[]) else PRINT_ERROR (("X doesn't seem to support your locale.\n")); +#ifdef HAVE_LANGINFO_CODESET + utf8_locale = !strcmp (nl_langinfo (CODESET), "UTF-8"); +#endif + /* Parse the arguments */ myargv = argv; while (1) -- cgit v1.2.3