Re: [PATCH 4/8] diff.c: reorder arguments for emit_line_ws_markup
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Aug 13, 2018, 12:09 UTC
- Message-ID
- <nycvar.QRO.7.76.6.1808131407580.71@tvgsbejvaqbjf.bet>
- In-Reply-To
- <20180810223441.30428-5-sbeller@google.com>
Hi Stefan,
On Fri, 10 Aug 2018, Stefan Beller wrote:
> The order shall be all colors first, then the content, flags at the end.
Okay.
> The colors are in order.
In order of what? Of the wavelength?
(I agree that the order now makes more sense, and that the diff is correct.)
Ciao, Dscho
Show 55 quoted lines
>
> Signed-off-by: Stefan Beller <sbeller@google.com>
> Signed-off-by: Junio C Hamano <gitster@pobox.com>
> ---
> diff.c | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/diff.c b/diff.c
> index f6df18af913..ab6e6a88a56 100644
> --- a/diff.c
> +++ b/diff.c
> @@ -1185,9 +1185,9 @@ static void dim_moved_lines(struct diff_options *o)
> }
>
> static void emit_line_ws_markup(struct diff_options *o,
> - const char *set, const char *reset,
> - const char *line, int len,
> - const char *set_sign, char sign,
> + const char *set_sign, const char *set,
> + const char *reset,
> + char sign, const char *line, int len,
> unsigned ws_rule, int blank_at_eof)
> {
> const char *ws = NULL;
> @@ -1271,7 +1271,7 @@ static void emit_diff_symbol_from_struct(struct diff_options *o,
> else if (c == '-')
> set = diff_get_color_opt(o, DIFF_FILE_OLD);
> }
> - emit_line_ws_markup(o, set, reset, line, len, set_sign, ' ',
> + emit_line_ws_markup(o, set_sign, set, reset, ' ', line, len,
> flags & (DIFF_SYMBOL_CONTENT_WS_MASK), 0);
> break;
> case DIFF_SYMBOL_PLUS:
> @@ -1314,7 +1314,7 @@ static void emit_diff_symbol_from_struct(struct diff_options *o,
> set = diff_get_color_opt(o, DIFF_CONTEXT_BOLD);
> flags &= ~DIFF_SYMBOL_CONTENT_WS_MASK;
> }
> - emit_line_ws_markup(o, set, reset, line, len, set_sign, '+',
> + emit_line_ws_markup(o, set_sign, set, reset, '+', line, len,
> flags & DIFF_SYMBOL_CONTENT_WS_MASK,
> flags & DIFF_SYMBOL_CONTENT_BLANK_LINE_EOF);
> break;
> @@ -1357,7 +1357,7 @@ static void emit_diff_symbol_from_struct(struct diff_options *o,
> else
> set = diff_get_color_opt(o, DIFF_CONTEXT_DIM);
> }
> - emit_line_ws_markup(o, set, reset, line, len, set_sign, '-',
> + emit_line_ws_markup(o, set_sign, set, reset, '-', line, len,
> flags & DIFF_SYMBOL_CONTENT_WS_MASK, 0);
> break;
> case DIFF_SYMBOL_WORDS_PORCELAIN:
> --
> 2.18.0.865.gffc8e1a3cd6-goog
>
>