mirror of
https://github.com/git/git.git
synced 2024-10-29 21:37:53 +01:00
diff.c: reorder arguments for emit_line_ws_markup
The order shall be all colors first, then the content, flags at the end. The colors are in the order of occurrence, i.e. first the color for the sign and then the color for the rest of the line. Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
84120cca09
commit
9d1e16bf59
1 changed files with 6 additions and 6 deletions
12
diff.c
12
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:
|
||||
|
|
Loading…
Reference in a new issue