Merge branch 'jk/gitweb-with-newer-cgi-multi-param' into maint

diff --git a/grep.h b/grep.h
index eaaced19737dfd46e718779cecadc352ff8d5f69..95f197a8d9bfc2a264530d17fcfa90f68dfa840d 100644 (file)
--- a/grep.h
+++ b/grep.h
@@ -124,7 +124,8 @@ struct grep_opt {
        char color_filename[COLOR_MAXLEN];
        char color_function[COLOR_MAXLEN];
        char color_lineno[COLOR_MAXLEN];
-       char color_match[COLOR_MAXLEN];
+       char color_match_context[COLOR_MAXLEN];
+       char color_match_selected[COLOR_MAXLEN];
        char color_selected[COLOR_MAXLEN];
        char color_sep[COLOR_MAXLEN];
        int regflags;