From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2209) id 95925385702F; Mon, 16 Oct 2023 23:05:53 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 95925385702F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1697497553; bh=lP3JkHIeTnzbKF8nV/iSpSWnEfMD1iIMXOZfv8iIIcg=; h=From:To:Subject:Date:From; b=L27TpDbhx+BVOSGC/EbMIMcTe7ubk0qeBh4ykRf8GQQft90CmFK9Sgtf55dRh/Tzv bMW8rGiv8Wu0YGrmMcpCcS8TXrUwvqnkV6CbVKNuZ3ov/RcsNsCjaGQZ+C0tRQEnYu 2IELs5D4YIJgXQQTFlcmnK29ZwNWbkss398dlmPo= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: David Malcolm To: gcc-cvs@gcc.gnu.org Subject: [gcc r14-4669] diagnostics: special-case -fdiagnostics-text-art-charset=ascii for LANG=C X-Act-Checkin: gcc X-Git-Author: David Malcolm X-Git-Refname: refs/heads/master X-Git-Oldrev: f8644b678285cf420219859a4384490d5947b731 X-Git-Newrev: 04013e4464020b4440aa41524a222658d7e36937 Message-Id: <20231016230553.95925385702F@sourceware.org> Date: Mon, 16 Oct 2023 23:05:53 +0000 (GMT) List-Id: https://gcc.gnu.org/g:04013e4464020b4440aa41524a222658d7e36937 commit r14-4669-g04013e4464020b4440aa41524a222658d7e36937 Author: David Malcolm Date: Mon Oct 16 19:04:50 2023 -0400 diagnostics: special-case -fdiagnostics-text-art-charset=ascii for LANG=C In the LWN discussion of the "ASCII" art in GCC 14 https://lwn.net/Articles/946733/#Comments there was some concern about the use of non-ASCII characters in the output. Currently -fdiagnostics-text-art-charset defaults to "emoji". To better handle older terminals by default, this patch special-cases LANG=C to use -fdiagnostics-text-art-charset=ascii. gcc/ChangeLog: * diagnostic.cc (diagnostic_initialize): When LANG=C, update default for -fdiagnostics-text-art-charset from emoji to ascii. * doc/invoke.texi (fdiagnostics-text-art-charset): Document the above. Signed-off-by: David Malcolm Diff: --- gcc/diagnostic.cc | 13 +++++++++++-- gcc/doc/invoke.texi | 3 ++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/gcc/diagnostic.cc b/gcc/diagnostic.cc index 03637459c56c..6e46371b3b4e 100644 --- a/gcc/diagnostic.cc +++ b/gcc/diagnostic.cc @@ -226,8 +226,17 @@ diagnostic_initialize (diagnostic_context *context, int n_opts) context->includes_seen = NULL; context->m_client_data_hooks = NULL; context->m_diagrams.m_theme = NULL; - diagnostics_text_art_charset_init (context, - DIAGNOSTICS_TEXT_ART_CHARSET_DEFAULT); + + enum diagnostic_text_art_charset text_art_charset + = DIAGNOSTICS_TEXT_ART_CHARSET_DEFAULT; + if (const char *lang = getenv ("LANG")) + { + /* For LANG=C, don't assume the terminal supports anything + other than ASCII. */ + if (!strcmp (lang, "C")) + text_art_charset = DIAGNOSTICS_TEXT_ART_CHARSET_ASCII; + } + diagnostics_text_art_charset_init (context, text_art_charset); } /* Maybe initialize the color support. We require clients to do this diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi index 2a500c1baeea..db59d8b6d4af 100644 --- a/gcc/doc/invoke.texi +++ b/gcc/doc/invoke.texi @@ -5688,7 +5688,8 @@ value further adds the possibility of emoji in the output (such as emitting U+26A0 WARNING SIGN followed by U+FE0F VARIATION SELECTOR-16 to select the emoji variant of the character). -The default is @samp{emoji}. +The default is @samp{emoji}, except when the environment variable @env{LANG} +is set to @samp{C}, in which case the default is @samp{ascii}. @opindex fdiagnostics-format @item -fdiagnostics-format=@var{FORMAT}