|
|
|
|
2013-09-20 Jakub Jelinek <jakub@redhat.com>
|
|
|
|
|
|
|
|
|
|
* common.opt (-fdiagnostics-color=): Default to auto.
|
|
|
|
|
* toplev.c (process_options): Always default to
|
|
|
|
|
-fdiagnostics-color=auto if no -f{,no-}diagnostics-color*.
|
|
|
|
|
* doc/invoke.texi (-fdiagnostics-color*): Adjust documentation
|
|
|
|
|
of the default.
|
|
|
|
|
|
|
|
|
|
--- gcc/common.opt.jj 2013-09-18 12:06:53.000000000 +0200
|
|
|
|
|
+++ gcc/common.opt 2013-09-20 10:00:00.935823900 +0200
|
|
|
|
|
@@ -1037,7 +1037,7 @@ Common Alias(fdiagnostics-color=,always,
|
|
|
|
|
;
|
|
|
|
|
|
|
|
|
|
fdiagnostics-color=
|
|
|
|
|
-Common Joined RejectNegative Var(flag_diagnostics_show_color) Enum(diagnostic_color_rule) Init(DIAGNOSTICS_COLOR_NO)
|
|
|
|
|
+Common Joined RejectNegative Var(flag_diagnostics_show_color) Enum(diagnostic_color_rule) Init(DIAGNOSTICS_COLOR_AUTO)
|
|
|
|
|
-fdiagnostics-color=[never|always|auto] Colorize diagnostics
|
|
|
|
|
|
|
|
|
|
; Required for these enum values.
|
|
|
|
|
--- gcc/toplev.c.jj 2013-09-09 11:32:39.000000000 +0200
|
|
|
|
|
+++ gcc/toplev.c 2013-09-20 10:10:08.198721005 +0200
|
|
|
|
|
@@ -1229,10 +1229,8 @@ process_options (void)
|
|
|
|
|
|
|
|
|
|
maximum_field_alignment = initial_max_fld_align * BITS_PER_UNIT;
|
|
|
|
|
|
|
|
|
|
- /* Default to -fdiagnostics-color=auto if GCC_COLORS is in the environment,
|
|
|
|
|
- otherwise default to -fdiagnostics-color=never. */
|
|
|
|
|
- if (!global_options_set.x_flag_diagnostics_show_color
|
|
|
|
|
- && getenv ("GCC_COLORS"))
|
|
|
|
|
+ /* Default to -fdiagnostics-color=auto. */
|
|
|
|
|
+ if (!global_options_set.x_flag_diagnostics_show_color)
|
|
|
|
|
pp_show_color (global_dc->printer)
|
|
|
|
|
= colorize_init (DIAGNOSTICS_COLOR_AUTO);
|
|
|
|
|
|
|
|
|
|
--- gcc/doc/invoke.texi.jj 2013-09-18 12:06:50.000000000 +0200
|
|
|
|
|
+++ gcc/doc/invoke.texi 2013-09-20 10:09:29.079904455 +0200
|
|
|
|
|
@@ -3046,8 +3046,7 @@ a message which is too long to fit on a
|
|
|
|
|
@cindex highlight, color, colour
|
|
|
|
|
@vindex GCC_COLORS @r{environment variable}
|
|
|
|
|
Use color in diagnostics. @var{WHEN} is @samp{never}, @samp{always},
|
|
|
|
|
-or @samp{auto}. The default is @samp{never} if @env{GCC_COLORS} environment
|
|
|
|
|
-variable isn't present in the environment, and @samp{auto} otherwise.
|
|
|
|
|
+or @samp{auto}. The default is @samp{auto}.
|
|
|
|
|
@samp{auto} means to use color only when the standard error is a terminal.
|
|
|
|
|
The forms @option{-fdiagnostics-color} and @option{-fno-diagnostics-color} are
|
|
|
|
|
aliases for @option{-fdiagnostics-color=always} and
|
