Merge branch 'jk/maint-1.6.3-ls-files-i' into maint

diff --git a/grep.h b/grep.h
index f00db0e40273c7cca1695ddc6be00921f9da8ef4..f6eecc62c038f212fa4efc8648f13f61bf937452 100644 (file)
--- a/grep.h
+++ b/grep.h
@@ -59,6 +59,7 @@ struct grep_opt {
        struct grep_pat *pattern_list;
        struct grep_pat **pattern_tail;
        struct grep_expr *pattern_expression;
+       const char *prefix;
        int prefix_length;
        regex_t regexp;
        int linenum;
@@ -79,6 +80,7 @@ struct grep_opt {
        int pathname;
        int null_following_name;
        int color;
+       int max_depth;
        int funcname;
        char color_match[COLOR_MAXLEN];
        const char *color_external;