summaryrefslogtreecommitdiff
path: root/grep.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-03-20 11:29:36 -0700
committerJunio C Hamano <gitster@pobox.com>2010-03-20 11:29:36 -0700
commitf1aa782a3b72a2c4de46dc93b484eb99dc01d4d0 (patch)
tree7f668cd8acbb2b897c71125d55ac64cac5a7b529 /grep.h
parentd7173d942ea897b67ac9ba3bab2a0cc374684ca6 (diff)
parent00588bb5cd4a7ff5e2b1ded97d4459bfe6aad6eb (diff)
downloadgit-f1aa782a3b72a2c4de46dc93b484eb99dc01d4d0.tar.gz
Merge branch 'ml/color-grep'
* ml/color-grep: grep: Colorize selected, context, and function lines grep: Colorize filename, line number, and separator Add GIT_COLOR_BOLD_* and GIT_COLOR_BG_*
Diffstat (limited to 'grep.h')
-rw-r--r--grep.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/grep.h b/grep.h
index d35bc29bfd..89342e5b47 100644
--- a/grep.h
+++ b/grep.h
@@ -86,7 +86,13 @@ struct grep_opt {
int color;
int max_depth;
int funcname;
+ char color_context[COLOR_MAXLEN];
+ char color_filename[COLOR_MAXLEN];
+ char color_function[COLOR_MAXLEN];
+ char color_lineno[COLOR_MAXLEN];
char color_match[COLOR_MAXLEN];
+ char color_selected[COLOR_MAXLEN];
+ char color_sep[COLOR_MAXLEN];
int regflags;
unsigned pre_context;
unsigned post_context;