From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 26 Jan 2009 01:13:29 +0000 (-0800)
Subject: Merge branch 'js/diff-color-words'
X-Git-Tag: v1.6.2-rc0~89
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9847a524321afbfa6dbb08bfd9b6a0746f965578;p=git.git

Merge branch 'js/diff-color-words'

* js/diff-color-words:
  Change the spelling of "wordregex".
  color-words: Support diff.wordregex config option
  color-words: make regex configurable via attributes
  color-words: expand docs with precise semantics
  color-words: enable REG_NEWLINE to help user
  color-words: take an optional regular expression describing words
  color-words: change algorithm to allow for 0-character word boundaries
  color-words: refactor word splitting and use ALLOC_GROW()
  Add color_fwrite_lines(), a function coloring each line individually
---

9847a524321afbfa6dbb08bfd9b6a0746f965578
diff --cc color.h
index 70660999d,cd5c985eb..5019df82f
--- a/color.h
+++ b/color.h
@@@ -16,9 -16,9 +16,10 @@@ extern int git_use_color_default
  int git_color_default_config(const char *var, const char *value, void *cb);
  
  int git_config_colorbool(const char *var, const char *value, int stdout_is_tty);
 -void color_parse(const char *var, const char *value, char *dst);
 +void color_parse(const char *value, const char *var, char *dst);
 +void color_parse_mem(const char *value, int len, const char *var, char *dst);
  int color_fprintf(FILE *fp, const char *color, const char *fmt, ...);
  int color_fprintf_ln(FILE *fp, const char *color, const char *fmt, ...);
+ int color_fwrite_lines(FILE *fp, const char *color, size_t count, const char *buf);
  
  #endif /* COLOR_H */