GNU bug report logs - #48532
[PATCH] diff: clarify defaults for --color

Previous Next

Package: diffutils;

Reported by: Peter Oliver <p.d.oliver <at> mavit.org.uk>

Date: Thu, 20 May 2021 12:02:02 UTC

Severity: normal

Tags: patch

Done: Paul Eggert <eggert <at> cs.ucla.edu>

Bug is archived. No further changes may be made.

Full log


View this message in rfc822 format

From: help-debbugs <at> gnu.org (GNU bug Tracking System)
To: Paul Eggert <eggert <at> cs.ucla.edu>
Cc: tracker <at> debbugs.gnu.org
Subject: bug#48532: closed ([PATCH] diff: clarify defaults for --color)
Date: Fri, 21 May 2021 07:14:02 +0000
[Message part 1 (text/plain, inline)]
Your message dated Fri, 21 May 2021 00:13:23 -0700
with message-id <e92278b2-2a4d-2a56-8208-07f737fabc18 <at> cs.ucla.edu>
and subject line Re: [bug-diffutils] bug#48532: [PATCH] diff: clarify defaults for --color
has caused the debbugs.gnu.org bug report #48532,
regarding [PATCH] diff: clarify defaults for --color
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs <at> gnu.org.)


-- 
48532: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=48532
GNU Bug Tracking System
Contact help-debbugs <at> gnu.org with problems
[Message part 2 (message/rfc822, inline)]
From: Peter Oliver <p.d.oliver <at> mavit.org.uk>
To: bug-diffutils <at> gnu.org
Cc: Peter Oliver <git <at> mavit.org.uk>
Subject: [PATCH] diff: clarify defaults for --color
Date: Thu, 20 May 2021 13:00:22 +0100
* 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 <git <at> mavit.org.uk>
---
 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



[Message part 3 (message/rfc822, inline)]
From: Paul Eggert <eggert <at> cs.ucla.edu>
To: Peter Oliver <p.d.oliver <at> mavit.org.uk>
Cc: Peter Oliver <git <at> mavit.org.uk>, 48532-done <at> debbugs.gnu.org
Subject: Re: [bug-diffutils] bug#48532: [PATCH] diff: clarify defaults for
 --color
Date: Fri, 21 May 2021 00:13:23 -0700
[Message part 4 (text/plain, inline)]
Thanks for the report about the confusing wording. I installed the 
attached, which avoids the tricky word "default" entirely.
[0001-diff-better-color-help.patch (text/x-patch, attachment)]

This bug report was last modified 4 years and 23 days ago.

Previous Next


GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.