nano

commit bafcc19b7a565c0bbe3f5c3a6b18acb28eabb5d7
parent 61c94c2f81f1f886476c6f60f4b792739475f3d6
Author: Benno Schulenberg <bensberg@telfort.nl>
Date:   Wed, 17 Jun 2020 16:54:48 +0200

tweaks: rename a symbol, from a phrase to a noun

Diffstat:
M
src/color.c
 | 
8
++++----
M
src/nano.h
 | 
2
+-
M
src/rcfile.c
 | 
8
++++----

3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/color.c b/src/color.c
@@ -55,9 +55,9 @@ void set_interface_colorpairs(void)
 
 		if (combo != NULL) {
 			if (!defaults_allowed) {
-				if (combo->fg == USE_THE_DEFAULT)
+				if (combo->fg == THE_DEFAULT)
 					combo->fg = COLOR_WHITE;
-				if (combo->bg == USE_THE_DEFAULT)
+				if (combo->bg == THE_DEFAULT)
 					combo->bg = COLOR_BLACK;
 			}
 			init_pair(index + 1, combo->fg, combo->bg);
@@ -89,9 +89,9 @@ void set_syntax_colorpairs(syntaxtype *sntx)
 
 	for (colortype *ink = sntx->color; ink != NULL; ink = ink->next) {
 		if (!defaults_allowed) {
-			if (ink->fg == USE_THE_DEFAULT)
+			if (ink->fg == THE_DEFAULT)
 				ink->fg = COLOR_WHITE;
-			if (ink->bg == USE_THE_DEFAULT)
+			if (ink->bg == THE_DEFAULT)
 				ink->bg = COLOR_BLACK;
 		}
 
diff --git a/src/nano.h b/src/nano.h
@@ -135,7 +135,7 @@
 #define INREGION   2
 
 #ifdef ENABLE_COLOR
-#define USE_THE_DEFAULT  -1
+#define THE_DEFAULT  -1
 #define BAD_COLOR  -2
 #endif
 
diff --git a/src/rcfile.c b/src/rcfile.c
@@ -1020,7 +1020,7 @@ short color_to_short(const char *colorname, bool *vivid, bool *thick)
 	else if (strcmp(colorname, "black") == 0)
 		return COLOR_BLACK;
 	else if (strcmp(colorname, "normal") == 0)
-		return USE_THE_DEFAULT;
+		return THE_DEFAULT;
 	else
 		for (int index = 0; index < 9; index++)
 			if (strcmp(colorname, hues[index]) == 0) {
@@ -1028,7 +1028,7 @@ short color_to_short(const char *colorname, bool *vivid, bool *thick)
 					jot_error(N_("Color '%s' takes no prefix"), colorname);
 					return BAD_COLOR;
 				} else if (COLORS < 255)
-					return USE_THE_DEFAULT;
+					return THE_DEFAULT;
 				else
 					return indices[index];
 			}
@@ -1078,7 +1078,7 @@ bool parse_combination(char *combostr, short *fg, short *bg, int *attributes)
 		else if (vivid)
 			*attributes |= A_BOLD;
 	} else
-		*fg = USE_THE_DEFAULT;
+		*fg = THE_DEFAULT;
 
 	if (comma) {
 		*bg = color_to_short(comma + 1, &vivid, &thick);
@@ -1087,7 +1087,7 @@ bool parse_combination(char *combostr, short *fg, short *bg, int *attributes)
 		if (vivid && COLORS > 8)
 			*bg += 8;
 	} else
-		*bg = USE_THE_DEFAULT;
+		*bg = THE_DEFAULT;
 
 	return TRUE;
 }