From a237f22e3cb20a19f91b68baf5326bdc5471bb5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juhani=20Krekel=C3=A4?= Date: Thu, 17 Feb 2022 01:58:30 +0200 Subject: [PATCH] fixup! Upstream Links 2.25 --- language.c | 3 +++ os_dep.c | 8 -------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/language.c b/language.c index cab6d63..b2aa7d7 100644 --- a/language.c +++ b/language.c @@ -2,6 +2,7 @@ * (c) 2002 Mikulas Patocka * This file is a part of the Links program, released under GPL. */ +#include #include "links.h" @@ -130,6 +131,8 @@ int get_default_charset(void) lang = cast_uchar getenv("LC_CTYPE"); if (!lang) lang = cast_uchar getenv("LANG"); + if (!lang) + lang = cast_uchar nl_langinfo(CODESET); if (!lang) { i = 0; goto ret_i; diff --git a/os_dep.c b/os_dep.c index 4222b67..8ebf95c 100644 --- a/os_dep.c +++ b/os_dep.c @@ -3434,14 +3434,6 @@ int os_default_charset(void) return 0; } -// PATCH: Always use UTF-8 instead of language-specific terminal charsets -#elif defined(__sortix__) - -int os_default_charset(void) -{ - return utf8_table; -} - #elif !defined(DOS) int os_default_charset(void)