From: Stefan Beller <sbeller@google.com>
To: gitster@pobox.com, Johannes.Schindelin@gmx.de
Cc: git@vger.kernel.org, Stefan Beller <sbeller@google.com>
Subject: [PATCH 4/8] diff.c: reorder arguments for emit_line_ws_markup
Date: Fri, 10 Aug 2018 15:34:37 -0700 [thread overview]
Message-ID: <20180810223441.30428-5-sbeller@google.com> (raw)
In-Reply-To: <20180810223441.30428-1-sbeller@google.com>
The order shall be all colors first, then the content, flags at the end.
The colors are in order.
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
next prev parent reply other threads:[~2018-08-10 22:34 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-10 22:34 [PATCH 0/8] Resending sb/range-diff-colors Stefan Beller
2018-08-10 22:34 ` [PATCH 1/8] test_decode_color: understand FAINT and ITALIC Stefan Beller
2018-08-10 22:34 ` [PATCH 2/8] t3206: add color test for range-diff --dual-color Stefan Beller
2018-08-13 12:05 ` Johannes Schindelin
2018-08-13 18:30 ` Stefan Beller
2018-08-10 22:34 ` [PATCH 3/8] diff.c: simplify caller of emit_line_0 Stefan Beller
2018-08-13 12:07 ` Johannes Schindelin
2018-08-10 22:34 ` Stefan Beller [this message]
2018-08-13 12:09 ` [PATCH 4/8] diff.c: reorder arguments for emit_line_ws_markup Johannes Schindelin
2018-08-10 22:34 ` [PATCH 5/8] diff.c: add set_sign to emit_line_0 Stefan Beller
2018-08-13 12:16 ` Johannes Schindelin
2018-08-13 23:42 ` Stefan Beller
2018-08-10 22:34 ` [PATCH 6/8] diff: use emit_line_0 once per line Stefan Beller
2018-08-13 12:22 ` Johannes Schindelin
2018-08-10 22:34 ` [PATCH 7/8] diff.c: compute reverse locally in emit_line_0 Stefan Beller
2018-08-13 12:26 ` Johannes Schindelin
2018-08-13 19:00 ` Stefan Beller
2018-08-10 22:34 ` [PATCH 8/8] diff.c: rewrite emit_line_0 more understandably Stefan Beller
2018-08-13 12:42 ` Johannes Schindelin
2018-08-13 18:57 ` Stefan Beller
2018-08-13 23:36 ` [PATCH 0/8] Resending sb/range-diff-colors Stefan Beller
2018-08-14 1:41 ` [PATCHv2 " Stefan Beller
2018-08-14 1:41 ` [PATCH 1/8] test_decode_color: understand FAINT and ITALIC Stefan Beller
2018-08-14 1:41 ` [PATCH 2/8] t3206: add color test for range-diff --dual-color Stefan Beller
2018-08-14 1:41 ` [PATCH 3/8] diff.c: simplify caller of emit_line_0 Stefan Beller
2018-08-14 1:41 ` [PATCH 4/8] diff.c: reorder arguments for emit_line_ws_markup Stefan Beller
2018-08-14 1:41 ` [PATCH 5/8] diff.c: add set_sign to emit_line_0 Stefan Beller
2018-08-14 1:41 ` [PATCH 6/8] diff: use emit_line_0 once per line Stefan Beller
2018-08-14 1:41 ` [PATCH 7/8] diff.c: omit check for line prefix in emit_line_0 Stefan Beller
2018-08-14 1:41 ` [PATCH 8/8] diff.c: rewrite emit_line_0 more understandably Stefan Beller
2018-08-14 15:05 ` [PATCHv2 0/8] Resending sb/range-diff-colors Johannes Schindelin
2018-08-14 16:45 ` Stefan Beller
-- strict thread matches above, loose matches on Subject: below --
2018-07-28 3:04 [PATCH 0/8] Add color test for range-diff, simplify diff.c Stefan Beller
2018-07-28 3:04 ` [PATCH 4/8] diff.c: reorder arguments for emit_line_ws_markup Stefan Beller
2018-07-31 0:31 ` [PATCHv2 0/8] Add color test for range-diff, simplify diff.c Stefan Beller
2018-07-31 0:31 ` [PATCH 4/8] diff.c: reorder arguments for emit_line_ws_markup Stefan Beller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180810223441.30428-5-sbeller@google.com \
--to=sbeller@google.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.