projects / packages / cross-gcc.git / blame
| Commit | Line | Data |
|---|---|---|
| b5b0b447 ER |
1 | 2013-09-20 Jakub Jelinek <jakub@redhat.com> |
| 2 | ||
| 3 | * common.opt (-fdiagnostics-color=): Default to auto. | |
| 4 | * toplev.c (process_options): Always default to | |
| 5 | -fdiagnostics-color=auto if no -f{,no-}diagnostics-color*. | |
| 6 | * doc/invoke.texi (-fdiagnostics-color*): Adjust documentation | |
| 7 | of the default. | |
| 8 | ||
| 9 | --- gcc/common.opt.jj 2013-09-18 12:06:53.000000000 +0200 | |
| 10 | +++ gcc/common.opt 2013-09-20 10:00:00.935823900 +0200 | |
| 11 | @@ -1037,7 +1037,7 @@ Common Alias(fdiagnostics-color=,always, | |
| 12 | ; | |
| 13 | ||
| 14 | fdiagnostics-color= | |
| 15 | -Common Joined RejectNegative Var(flag_diagnostics_show_color) Enum(diagnostic_color_rule) Init(DIAGNOSTICS_COLOR_NO) | |
| 16 | +Common Joined RejectNegative Var(flag_diagnostics_show_color) Enum(diagnostic_color_rule) Init(DIAGNOSTICS_COLOR_AUTO) | |
| 17 | -fdiagnostics-color=[never|always|auto] Colorize diagnostics | |
| 18 | ||
| 19 | ; Required for these enum values. | |
| 20 | --- gcc/toplev.c.jj 2013-09-09 11:32:39.000000000 +0200 | |
| 21 | +++ gcc/toplev.c 2013-09-20 10:10:08.198721005 +0200 | |
| 22 | @@ -1229,10 +1229,8 @@ process_options (void) | |
| 23 | ||
| 24 | maximum_field_alignment = initial_max_fld_align * BITS_PER_UNIT; | |
| 25 | ||
| 26 | - /* Default to -fdiagnostics-color=auto if GCC_COLORS is in the environment, | |
| 27 | - otherwise default to -fdiagnostics-color=never. */ | |
| 28 | - if (!global_options_set.x_flag_diagnostics_show_color | |
| 29 | - && getenv ("GCC_COLORS")) | |
| 30 | + /* Default to -fdiagnostics-color=auto. */ | |
| 31 | + if (!global_options_set.x_flag_diagnostics_show_color) | |
| 32 | pp_show_color (global_dc->printer) | |
| 33 | = colorize_init (DIAGNOSTICS_COLOR_AUTO); | |
| 34 | ||
| 35 | --- gcc/doc/invoke.texi.jj 2013-09-18 12:06:50.000000000 +0200 | |
| 36 | +++ gcc/doc/invoke.texi 2013-09-20 10:09:29.079904455 +0200 | |
| 37 | @@ -3046,8 +3046,7 @@ a message which is too long to fit on a | |
| 38 | @cindex highlight, color, colour | |
| 39 | @vindex GCC_COLORS @r{environment variable} | |
| 40 | Use color in diagnostics. @var{WHEN} is @samp{never}, @samp{always}, | |
| 41 | -or @samp{auto}. The default is @samp{never} if @env{GCC_COLORS} environment | |
| 42 | -variable isn't present in the environment, and @samp{auto} otherwise. | |
| 43 | +or @samp{auto}. The default is @samp{auto}. | |
| 44 | @samp{auto} means to use color only when the standard error is a terminal. | |
| 45 | The forms @option{-fdiagnostics-color} and @option{-fno-diagnostics-color} are | |
| 46 | aliases for @option{-fdiagnostics-color=always} and |