X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=grep.h;h=a65280026d5dee8ab059bead79f05d6a1111147a;hb=d0482e88a735787f7bb33ef4783be0e7f6a70946;hp=cd055cdfa8cac903382d592f1ec7e2a22bf7f897;hpb=52b195f2b8e0d8c9d4583aab44846698ed3149f2;p=git.git diff --git a/grep.h b/grep.h index cd055cdfa..a65280026 100644 --- a/grep.h +++ b/grep.h @@ -7,6 +7,7 @@ typedef int pcre; typedef int pcre_extra; #endif +#include "kwset.h" enum grep_pat_token { GREP_PATTERN, @@ -41,6 +42,7 @@ struct grep_pat { regex_t regexp; pcre *pcre_regexp; pcre_extra *pcre_extra_info; + kwset_t kws; unsigned fixed:1; unsigned ignore_case:1; unsigned word_regexp:1; @@ -98,6 +100,7 @@ struct grep_opt { int color; int max_depth; int funcname; + int funcbody; char color_context[COLOR_MAXLEN]; char color_filename[COLOR_MAXLEN]; char color_function[COLOR_MAXLEN]; @@ -110,6 +113,8 @@ struct grep_opt { unsigned post_context; unsigned last_shown; int show_hunk_mark; + int file_break; + int heading; void *priv; void (*output)(struct grep_opt *opt, const void *data, size_t size);