commit aa086eb813d4fe21aac556a94efe5e29b44d8ca4
author Matthias Lederhofer <matled@gmx.net> Sun Jul 30 00:27:43 2006 +0200
committer Junio C Hamano <junkio@cox.net> Mon Jul 31 15:32:24 2006 -0700
tree 04d9a749f051bdf8d3f7239ea29e9917addc7c2d
parent 9590b041ea464c46d5a6811df5bce83c5dd4d457

pager: config variable pager.color

enable/disable colored output when the pager is in use

Signed-off-by: Matthias Lederhofer <matled@gmx.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff.c

diff --git a/diff.c b/diff.c
index 6a71376..607c357 100644
--- a/diff.c
+++ b/diff.c
@@ -175,7 +175,7 @@
 			diff_use_color_default = 1; /* bool */
 		else if (!strcasecmp(value, "auto")) {
 			diff_use_color_default = 0;
-			if (isatty(1) || pager_in_use) {
+			if (isatty(1) || (pager_in_use && pager_use_color)) {
 				char *term = getenv("TERM");
 				if (term && strcmp(term, "dumb"))
 					diff_use_color_default = 1;