diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2020-10-10 11:02:12 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2020-10-10 11:02:12 +0000 |
| commit | b308e09261f788e5b004c79e72f907b207d7f37c (patch) | |
| tree | 55a372d7c4289e5f83dc354ad04c532cb98db762 /main.c | |
| parent | shm: MAP_UNINITIALIZED is a linux only mmap flag (diff) | |
| parent | doc: foot.ini: word-delimiters: whitespace chars are always delimiters (diff) | |
Merge branch 'configurable-word-delimiters' into master
Closes #156
Diffstat (limited to 'main.c')
| -rw-r--r-- | main.c | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -352,6 +352,13 @@ main(int argc, char *const *argv) LOG_INFO("arch: %s/%zu-bit, ", name.machine, sizeof(void *) * 8); } + setlocale(LC_CTYPE, ""); + LOG_INFO("locale: %s", setlocale(LC_CTYPE, NULL)); + if (!locale_is_utf8()) { + LOG_ERR("locale is not UTF-8"); + return ret; + } + struct config conf = {NULL}; if (!config_load(&conf, conf_path, &user_notifications, check_config)) { config_free(conf); @@ -365,13 +372,6 @@ main(int argc, char *const *argv) fcft_set_scaling_filter(conf.tweak.fcft_filter); - setlocale(LC_CTYPE, ""); - LOG_INFO("locale: %s", setlocale(LC_CTYPE, NULL)); - if (!locale_is_utf8()) { - LOG_ERR("locale is not UTF-8"); - return ret; - } - if (conf_term != NULL) { free(conf.term); conf.term = xstrdup(conf_term); |
