More color and attribute maps closer to the users

diff --git a/tig.c b/tig.c
index f541697a26a5863a829785e0c1454729941aa325..4a4ce9a5517c1761d3a52fea9f064051d7f5ae47 100644 (file)
--- a/tig.c
+++ b/tig.c
@@ -452,30 +452,6 @@ parse_options(int argc, char *argv[])
 }
 
 
 }
 
 

-static struct int_map color_map[] = {
-#define COLOR_MAP(name) { #name, STRING_SIZE(#name), COLOR_##name }
-       COLOR_MAP(DEFAULT),
-       COLOR_MAP(BLACK),
-       COLOR_MAP(BLUE),
-       COLOR_MAP(CYAN),
-       COLOR_MAP(GREEN),
-       COLOR_MAP(MAGENTA),
-       COLOR_MAP(RED),
-       COLOR_MAP(WHITE),
-       COLOR_MAP(YELLOW),
-};
-
-static struct int_map attr_map[] = {
-#define ATTR_MAP(name) { #name, STRING_SIZE(#name), A_##name }
-       ATTR_MAP(NORMAL),
-       ATTR_MAP(BLINK),
-       ATTR_MAP(BOLD),
-       ATTR_MAP(DIM),
-       ATTR_MAP(REVERSE),
-       ATTR_MAP(STANDOUT),
-       ATTR_MAP(UNDERLINE),
-};
-

 #define LINE_INFO \
 LINE(DIFF_HEADER,  "diff --git ",      COLOR_YELLOW,   COLOR_DEFAULT,  0), \
 LINE(DIFF_CHUNK,   "@@",               COLOR_MAGENTA,  COLOR_DEFAULT,  0), \
 #define LINE_INFO \
 LINE(DIFF_HEADER,  "diff --git ",      COLOR_YELLOW,   COLOR_DEFAULT,  0), \
 LINE(DIFF_CHUNK,   "@@",               COLOR_MAGENTA,  COLOR_DEFAULT,  0), \


@@ -620,9 +596,33 @@ struct line {
  * User config file handling.
  */
 
  * User config file handling.
  */
 

+static struct int_map color_map[] = {
+#define COLOR_MAP(name) { #name, STRING_SIZE(#name), COLOR_##name }
+       COLOR_MAP(DEFAULT),
+       COLOR_MAP(BLACK),
+       COLOR_MAP(BLUE),
+       COLOR_MAP(CYAN),
+       COLOR_MAP(GREEN),
+       COLOR_MAP(MAGENTA),
+       COLOR_MAP(RED),
+       COLOR_MAP(WHITE),
+       COLOR_MAP(YELLOW),
+};
+

 #define set_color(color, name, namelen) \
        set_from_int_map(color_map, ARRAY_SIZE(color_map), color, name, namelen)
 
 #define set_color(color, name, namelen) \
        set_from_int_map(color_map, ARRAY_SIZE(color_map), color, name, namelen)
 

+static struct int_map attr_map[] = {
+#define ATTR_MAP(name) { #name, STRING_SIZE(#name), A_##name }
+       ATTR_MAP(NORMAL),
+       ATTR_MAP(BLINK),
+       ATTR_MAP(BOLD),
+       ATTR_MAP(DIM),
+       ATTR_MAP(REVERSE),
+       ATTR_MAP(STANDOUT),
+       ATTR_MAP(UNDERLINE),
+};
+

 #define set_attribute(attr, name, namelen) \
        set_from_int_map(attr_map, ARRAY_SIZE(attr_map), attr, name, namelen)
 
 #define set_attribute(attr, name, namelen) \
        set_from_int_map(attr_map, ARRAY_SIZE(attr_map), attr, name, namelen)