color unchanged lines as "plain" in "diff --color-words"

These were mistakenly being colored in "meta" color. Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jeff King committed Jan 17, 2008 at 10:03 UTC 472ca780773ac75fa6af881117ce5360957fae2d

1 file changed +5 -5

diff.c

+5 -5

@@ -552,7 +552,8 @@ static void fn_out_consume(void *priv, char *line, unsigned long len)

552 int i;

553 int color;

554 struct emit_callback *ecbdata = priv;

555 - const char *set = diff_get_color(ecbdata->color_diff, DIFF_METAINFO);

555 + const char *meta = diff_get_color(ecbdata->color_diff, DIFF_METAINFO);

556 + const char *plain = diff_get_color(ecbdata->color_diff, DIFF_PLAIN);

557 const char *reset = diff_get_color(ecbdata->color_diff, DIFF_RESET);

558

559 *(ecbdata->found_changesp) = 1;

@@ -564,9 +565,9 @@ static void fn_out_consume(void *priv, char *line, unsigned long len)

565 name_b_tab = strchr(ecbdata->label_path[1], ' ') ? "\t" : "";

566

567 printf("%s--- %s%s%s\n",

567 - set, ecbdata->label_path[0], reset, name_a_tab);

568 + meta, ecbdata->label_path[0], reset, name_a_tab);

569 printf("%s+++ %s%s%s\n",

569 - set, ecbdata->label_path[1], reset, name_b_tab);

570 + meta, ecbdata->label_path[1], reset, name_b_tab);

571 ecbdata->label_path[0] = ecbdata->label_path[1] = NULL;

572 }

573

@@ -586,7 +587,6 @@ static void fn_out_consume(void *priv, char *line, unsigned long len)

587 }

588

589 if (len < ecbdata->nparents) {

589 - set = reset;

590 emit_line(reset, reset, line, len);

591 return;

592 }

@@ -610,7 +610,7 @@ static void fn_out_consume(void *priv, char *line, unsigned long len)

610 diff_words_show(ecbdata->diff_words);

611 line++;

612 len--;

613 - emit_line(set, reset, line, len);

613 + emit_line(plain, reset, line, len);

614 return;

615 }

616 for (i = 0; i < ecbdata->nparents && len; i++) {