mirror/diffutils
1
0
Fork 0
mirror of https://https.git.savannah.gnu.org/git/diffutils.git synced 2026-01-27 09:54:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

diff: disable colorization for TERM=dumb

Browse Source 
* src/diff.c (main): With --color or --color=auto, when TERM is
"dumb", disable colorization.  Suggested by Daniel Colascione.
* NEWS (Bug fixes): Mention it.
* tests/colors: Add a test that would fail without this change,
yet passes with it.
This commit is contained in:
Jim Meyering 2016-08-08 18:50:15 -07:00
parent 0936993252
commit 697c1f4fa9
3 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
NEWS
View File

@ -2,6 +2,10 @@ GNU diffutils NEWS -*- outline -*-
* Noteworthy changes in release ?.? (????-??-??) [?]
** Bug fixes
diff --color no longer colorizes when TERM=dumb
* Noteworthy changes in release 3.4 (2016-08-08) [stable]

7
src/diff.c
View File

@ -656,6 +656,13 @@ main (int argc, char **argv)
prev = c;
}
if (colors_style == AUTO)
{
char const *t = getenv ("TERM");
if (t && STREQ (t, "dumb"))
colors_style = NEVER;
}
if (output_style == OUTPUT_UNSPECIFIED)
{
if (show_c_function)

5
tests/colors
View File

@ -86,6 +86,11 @@ test $? = 1 || fail=1
gen_exp_default > exp || framework_failure_
compare exp out || fail=1
TERM=dumb diff ---presume-output-tty --color=auto a b > out
test $? = 1 || fail=1
gen_exp_default > exp || framework_failure_
compare exp out || fail=1
diff --color=never a b > out
test $? = 1 || fail=1
gen_exp_default > exp || framework_failure_