Merge pull request #1368 from oleskiewicz/master

djcb · web-flow · commit eb6efee81db2 · 2019-02-02T13:34:25.000+02:00
mu-config: add NO_COLOR environment variable
diff --git a/man/mu-easy.1 b/man/mu-easy.1
@@ -22,8 +22,9 @@ commands, but you won't be able to index/search your mail.
 
 By default, \fBmu\fR uses colorized output when it thinks your
 terminal is capable of doing so. If you don't like color, you can use
-the \fB--nocolor\fR command-line option, or set the \fBMU_NOCOLOR\fR
-environment variable to non-empty.
+the \fB--nocolor\fR command-line option, or set either the
+\fBMU_NOCOLOR\fR or the \fBNO_COLOR\fR environment variable to
+non-empty.
 
 .SH INDEXING YOUR E-MAIL
 
diff --git a/mu/mu-config.c b/mu/mu-config.c
@@ -79,9 +79,9 @@ set_group_mu_defaults (void)
 		MU_CONFIG.muhome = exp;
 	}
 
-	/* check for the MU_NOCOLOR env var; but in any case don't
+	/* check for the MU_NOCOLOR or NO_COLOR env vars; but in any case don't
 	 * use colors unless we're writing to a tty */
-	if (g_getenv (MU_NOCOLOR) != NULL)
+	if (g_getenv (MU_NOCOLOR) != NULL || g_getenv ("NO_COLOR") != NULL)
 		MU_CONFIG.nocolor = TRUE;
 
 	if (!isatty(fileno(stdout)) || !isatty(fileno(stderr)))
