Merge branch 'jk/ui-color-always-to-auto'

diff --git a/grep.h b/grep.h
index ed25be271b5b6a002fdb582fd5c11a499a4f0c94..0ba62a11c5cc2767b15b52aca20a0ea5b00870b8 100644 (file)
--- a/grep.h
+++ b/grep.h
@@ -67,6 +67,7 @@ enum grep_color {
        GREP_COLOR_FILENAME,
        GREP_COLOR_FUNCTION,
        GREP_COLOR_LINENO,
+       GREP_COLOR_COLUMNNO,
        GREP_COLOR_MATCH_CONTEXT,
        GREP_COLOR_MATCH_SELECTED,
        GREP_COLOR_SELECTED,
@@ -139,6 +140,7 @@ struct grep_opt {
        int prefix_length;
        regex_t regexp;
        int linenum;
+       int columnnum;
        int invert;
        int ignore_case;
        int status_only;
@@ -161,6 +163,7 @@ struct grep_opt {
        int relative;
        int pathname;
        int null_following_name;
+       int only_matching;
        int color;
        int max_depth;
        int funcname;