From unknown Sat Jun 14 03:54:41 2025 X-Loop: help-debbugs@gnu.org Subject: bug#48532: [PATCH] diff: clarify defaults for --color Resent-From: Peter Oliver Original-Sender: "Debbugs-submit" Resent-CC: bug-diffutils@gnu.org Resent-Date: Thu, 20 May 2021 12:02:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 48532 X-GNU-PR-Package: diffutils X-GNU-PR-Keywords: patch To: 48532@debbugs.gnu.org Cc: Peter Oliver X-Debbugs-Original-To: bug-diffutils@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.162151208012944 (code B ref -1); Thu, 20 May 2021 12:02:02 +0000 Received: (at submit) by debbugs.gnu.org; 20 May 2021 12:01:20 +0000 Received: from localhost ([127.0.0.1]:33251 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ljhMe-0003Mh-3I for submit@debbugs.gnu.org; Thu, 20 May 2021 08:01:20 -0400 Received: from lists.gnu.org ([209.51.188.17]:40496) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ljhMc-0003Ma-U1 for submit@debbugs.gnu.org; Thu, 20 May 2021 08:01:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55058) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ljhMc-0001Sa-AE for bug-diffutils@gnu.org; Thu, 20 May 2021 08:01:18 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:40714) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ljhMV-00026Q-Nq for bug-diffutils@gnu.org; Thu, 20 May 2021 08:01:18 -0400 Received: by mail-wr1-x42f.google.com with SMTP id z17so17362998wrq.7 for ; Thu, 20 May 2021 05:01:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mavit.org.uk; s=google; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=rE8bRWx9dsnEpU1JM8vKZ3ICBmllilbmuWDdS57db/g=; b=MbvSssyh+59WgUvbvgg/2JGNR1FIxJhg4kyUOPqWYvbZcDD83xAzu3nqkq0k32F6so 4q6gZs7+fJXuKbVDiyvkAVMzzP3nCy6W2aKa5s6WKt14o+WJUgWdXUGT/FJuv/Z6mb9c Cwq+TWjRxz3hAq1RYq8x75rS1pDCrfoTX6s9o= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=rE8bRWx9dsnEpU1JM8vKZ3ICBmllilbmuWDdS57db/g=; b=BEguDNiMjHxs1zlJ1HzCn187OvZ8vGDmB+XQNyGxGyfMd3UFywMX9cGFbl6GOjjrIP lLNYWIWd7pkwDnkD+ZnGmTYRwWnPVCxDN7ktjeyHLMSd3ZNe7lnCrBccJQovRPMZyMrn xcI7YmKVFO553r78DPAdxmgguKXuHBC1mEPhaunJXC3i5zYbpzdbntkUhagHOjAriOLX /p5fM03HzeAYafBk5dBXtYdgpXniwbmMGqO9Wrf2SKddSBL00W3xy/JHTa/nyy4cYfqU mE2OGIkb4cZR/G7CbxlfqMKTtFlZi1HGWOOOMxYoucUKgqoJj2cejAxzFrp5BYjOI2Gd Skeg== X-Gm-Message-State: AOAM530zEd6beABxfRD31QGYeQgbP0FoD3fM/3KHsBDUMakhjmVZDS+C ZBV8LT10rOIjb543DV3Pqpm8OQRF1iFH/w== X-Google-Smtp-Source: ABdhPJzFa+bTEh5SajozpshZtQyWWwBx8rfxMNDTV/CKDRtWr5LI2ncdZgF+xr6Gl60NOksL4Nwswg== X-Received: by 2002:a5d:5401:: with SMTP id g1mr4021762wrv.1.1621512066803; Thu, 20 May 2021 05:01:06 -0700 (PDT) Received: from froglet.home.mavit.org.uk (cpc118948-dudl14-2-0-cust32.16-1.cable.virginm.net. [82.37.201.33]) by smtp.gmail.com with ESMTPSA id n15sm2919630wrr.20.2021.05.20.05.01.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 May 2021 05:01:06 -0700 (PDT) From: Peter Oliver X-Google-Original-From: Peter Oliver Received: from froglet.home.mavit.org.uk (localhost [127.0.0.1]) by froglet.home.mavit.org.uk (8.16.1/8.15.2) with ESMTPS id 14KC15iP077401 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Thu, 20 May 2021 13:01:05 +0100 Received: (from mavit@localhost) by froglet.home.mavit.org.uk (8.16.1/8.16.1/Submit) id 14KC14wD077400; Thu, 20 May 2021 13:01:04 +0100 Date: Thu, 20 May 2021 13:00:22 +0100 Message-Id: <20210520120022.77289-1-git@mavit.org.uk> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::42f; envelope-from=mavit@mavit.org.uk; helo=mail-wr1-x42f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.6 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.6 (--) * src/diff.c (option_help_msgid): Make it clear that --color=auto is not the default when --color is not specified. Signed-off-by: Peter Oliver --- src/diff.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/diff.c b/src/diff.c index 6af50e8..f391ab9 100644 --- a/src/diff.c +++ b/src/diff.c @@ -973,8 +973,9 @@ static char const * const option_help_msgid[] = { N_("-d, --minimal try hard to find a smaller set of changes"), N_(" --horizon-lines=NUM keep NUM lines of the common prefix and suffix"), N_(" --speed-large-files assume large files and many scattered small changes"), - N_(" --color[=WHEN] colorize the output; WHEN can be 'never', 'always',\n" - " or 'auto' (the default)"), + N_(" --color[=WHEN] colorize the output; WHEN can be 'never' (the\n" + " default), 'auto' (implied if --color is specified\n" + " without WHEN), or 'always'"), N_(" --palette=PALETTE the colors to use when --color is active; PALETTE is\n" " a colon-separated list of terminfo capabilities"), "", -- 2.31.1 From unknown Sat Jun 14 03:54:41 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Peter Oliver Subject: bug#48532: closed (Re: [bug-diffutils] bug#48532: [PATCH] diff: clarify defaults for --color) Message-ID: References: <20210520120022.77289-1-git@mavit.org.uk> X-Gnu-PR-Message: they-closed 48532 X-Gnu-PR-Package: diffutils X-Gnu-PR-Keywords: patch Reply-To: 48532@debbugs.gnu.org Date: Fri, 21 May 2021 07:14:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1621581242-16201-1" This is a multi-part message in MIME format... ------------=_1621581242-16201-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #48532: [PATCH] diff: clarify defaults for --color which was filed against the diffutils package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 48532@debbugs.gnu.org. --=20 48532: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D48532 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1621581242-16201-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 48532-done) by debbugs.gnu.org; 21 May 2021 07:13:34 +0000 Received: from localhost ([127.0.0.1]:35676 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ljzLi-0004CZ-9j for submit@debbugs.gnu.org; Fri, 21 May 2021 03:13:34 -0400 Received: from zimbra.cs.ucla.edu ([131.179.128.68]:59100) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ljzLg-0004CI-3S for 48532-done@debbugs.gnu.org; Fri, 21 May 2021 03:13:33 -0400 Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id 3F5ED16005E; Fri, 21 May 2021 00:13:25 -0700 (PDT) Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id vWWdg8SCDvXc; Fri, 21 May 2021 00:13:24 -0700 (PDT) Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id 72F1C1600BC; Fri, 21 May 2021 00:13:24 -0700 (PDT) X-Virus-Scanned: amavisd-new at zimbra.cs.ucla.edu Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id L7jJN3wmpWsc; Fri, 21 May 2021 00:13:24 -0700 (PDT) Received: from [192.168.1.9] (cpe-172-91-119-151.socal.res.rr.com [172.91.119.151]) by zimbra.cs.ucla.edu (Postfix) with ESMTPSA id 25F3416005E; Fri, 21 May 2021 00:13:24 -0700 (PDT) Subject: Re: [bug-diffutils] bug#48532: [PATCH] diff: clarify defaults for --color To: Peter Oliver References: <20210520120022.77289-1-git@mavit.org.uk> From: Paul Eggert Organization: UCLA Computer Science Department Message-ID: Date: Fri, 21 May 2021 00:13:23 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.8.1 MIME-Version: 1.0 In-Reply-To: <20210520120022.77289-1-git@mavit.org.uk> Content-Type: multipart/mixed; boundary="------------AB90BEAA98084A8EBE2BD0EC" Content-Language: en-US X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 48532-done Cc: Peter Oliver , 48532-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) This is a multi-part message in MIME format. --------------AB90BEAA98084A8EBE2BD0EC Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Thanks for the report about the confusing wording. I installed the attached, which avoids the tricky word "default" entirely. --------------AB90BEAA98084A8EBE2BD0EC Content-Type: text/x-patch; charset=UTF-8; name="0001-diff-better-color-help.patch" Content-Disposition: attachment; filename="0001-diff-better-color-help.patch" Content-Transfer-Encoding: quoted-printable >From ffb75e3b0c94ab7063c063b58408844f7b85efc6 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Fri, 21 May 2021 00:11:06 -0700 Subject: [PATCH] diff: better --color help MIME-Version: 1.0 Content-Type: text/plain; charset=3DUTF-8 Content-Transfer-Encoding: 8bit * src/diff.c (option_help_msgid): Reword --color help without using the confusing word =E2=80=9Cdefault=E2=80=9D. Problem reported by Peter Oliver (Bug#48532). --- src/diff.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/diff.c b/src/diff.c index 6af50e8..9938daa 100644 --- a/src/diff.c +++ b/src/diff.c @@ -973,8 +973,8 @@ static char const * const option_help_msgid[] =3D { N_("-d, --minimal try hard to find a smaller set of changes= "), N_(" --horizon-lines=3DNUM keep NUM lines of the common prefix and= suffix"), N_(" --speed-large-files assume large files and many scattered sma= ll changes"), - N_(" --color[=3DWHEN] colorize the output; WHEN can be 'never= ', 'always',\n" - " or 'auto' (the default)"), + N_(" --color[=3DWHEN] color output; WHEN is 'never', 'always'= , or 'auto';\n" + " plain --color means --color=3D'auto'"), N_(" --palette=3DPALETTE the colors to use when --color is activ= e; PALETTE is\n" " a colon-separated list of terminfo capa= bilities"), "", --=20 2.27.0 --------------AB90BEAA98084A8EBE2BD0EC-- ------------=_1621581242-16201-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 20 May 2021 12:01:20 +0000 Received: from localhost ([127.0.0.1]:33251 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ljhMe-0003Mh-3I for submit@debbugs.gnu.org; Thu, 20 May 2021 08:01:20 -0400 Received: from lists.gnu.org ([209.51.188.17]:40496) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ljhMc-0003Ma-U1 for submit@debbugs.gnu.org; Thu, 20 May 2021 08:01:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55058) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ljhMc-0001Sa-AE for bug-diffutils@gnu.org; Thu, 20 May 2021 08:01:18 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:40714) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ljhMV-00026Q-Nq for bug-diffutils@gnu.org; Thu, 20 May 2021 08:01:18 -0400 Received: by mail-wr1-x42f.google.com with SMTP id z17so17362998wrq.7 for ; Thu, 20 May 2021 05:01:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mavit.org.uk; s=google; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=rE8bRWx9dsnEpU1JM8vKZ3ICBmllilbmuWDdS57db/g=; b=MbvSssyh+59WgUvbvgg/2JGNR1FIxJhg4kyUOPqWYvbZcDD83xAzu3nqkq0k32F6so 4q6gZs7+fJXuKbVDiyvkAVMzzP3nCy6W2aKa5s6WKt14o+WJUgWdXUGT/FJuv/Z6mb9c Cwq+TWjRxz3hAq1RYq8x75rS1pDCrfoTX6s9o= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=rE8bRWx9dsnEpU1JM8vKZ3ICBmllilbmuWDdS57db/g=; b=BEguDNiMjHxs1zlJ1HzCn187OvZ8vGDmB+XQNyGxGyfMd3UFywMX9cGFbl6GOjjrIP lLNYWIWd7pkwDnkD+ZnGmTYRwWnPVCxDN7ktjeyHLMSd3ZNe7lnCrBccJQovRPMZyMrn xcI7YmKVFO553r78DPAdxmgguKXuHBC1mEPhaunJXC3i5zYbpzdbntkUhagHOjAriOLX /p5fM03HzeAYafBk5dBXtYdgpXniwbmMGqO9Wrf2SKddSBL00W3xy/JHTa/nyy4cYfqU mE2OGIkb4cZR/G7CbxlfqMKTtFlZi1HGWOOOMxYoucUKgqoJj2cejAxzFrp5BYjOI2Gd Skeg== X-Gm-Message-State: AOAM530zEd6beABxfRD31QGYeQgbP0FoD3fM/3KHsBDUMakhjmVZDS+C ZBV8LT10rOIjb543DV3Pqpm8OQRF1iFH/w== X-Google-Smtp-Source: ABdhPJzFa+bTEh5SajozpshZtQyWWwBx8rfxMNDTV/CKDRtWr5LI2ncdZgF+xr6Gl60NOksL4Nwswg== X-Received: by 2002:a5d:5401:: with SMTP id g1mr4021762wrv.1.1621512066803; Thu, 20 May 2021 05:01:06 -0700 (PDT) Received: from froglet.home.mavit.org.uk (cpc118948-dudl14-2-0-cust32.16-1.cable.virginm.net. [82.37.201.33]) by smtp.gmail.com with ESMTPSA id n15sm2919630wrr.20.2021.05.20.05.01.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 May 2021 05:01:06 -0700 (PDT) From: Peter Oliver X-Google-Original-From: Peter Oliver Received: from froglet.home.mavit.org.uk (localhost [127.0.0.1]) by froglet.home.mavit.org.uk (8.16.1/8.15.2) with ESMTPS id 14KC15iP077401 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Thu, 20 May 2021 13:01:05 +0100 Received: (from mavit@localhost) by froglet.home.mavit.org.uk (8.16.1/8.16.1/Submit) id 14KC14wD077400; Thu, 20 May 2021 13:01:04 +0100 To: bug-diffutils@gnu.org Subject: [PATCH] diff: clarify defaults for --color Date: Thu, 20 May 2021 13:00:22 +0100 Message-Id: <20210520120022.77289-1-git@mavit.org.uk> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::42f; envelope-from=mavit@mavit.org.uk; helo=mail-wr1-x42f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.6 (-) X-Debbugs-Envelope-To: submit Cc: Peter Oliver X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.6 (--) * src/diff.c (option_help_msgid): Make it clear that --color=auto is not the default when --color is not specified. Signed-off-by: Peter Oliver --- src/diff.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/diff.c b/src/diff.c index 6af50e8..f391ab9 100644 --- a/src/diff.c +++ b/src/diff.c @@ -973,8 +973,9 @@ static char const * const option_help_msgid[] = { N_("-d, --minimal try hard to find a smaller set of changes"), N_(" --horizon-lines=NUM keep NUM lines of the common prefix and suffix"), N_(" --speed-large-files assume large files and many scattered small changes"), - N_(" --color[=WHEN] colorize the output; WHEN can be 'never', 'always',\n" - " or 'auto' (the default)"), + N_(" --color[=WHEN] colorize the output; WHEN can be 'never' (the\n" + " default), 'auto' (implied if --color is specified\n" + " without WHEN), or 'always'"), N_(" --palette=PALETTE the colors to use when --color is active; PALETTE is\n" " a colon-separated list of terminfo capabilities"), "", -- 2.31.1 ------------=_1621581242-16201-1--