nano

commit 570fb6c6062bd62dd3b049550110d7b26af37fa0
parent 1de366755567e13aeff9a6040769ec3ac6cd9e80
Author: Benno Schulenberg <bensberg@telfort.nl>
Date:   Tue, 27 Mar 2018 13:31:37 +0200

small addition: understand color name "normal" to mean the default color

This allows a syntax to remove the color from things that were colored
overeagerly by earlier regexes.

Diffstat:
M
src/rcfile.c
 | 
9
+++++++--

1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/rcfile.c b/src/rcfile.c
@@ -602,9 +602,11 @@ short color_to_short(const char *colorname, bool *bright)
 		return COLOR_MAGENTA;
 	else if (strcasecmp(colorname, "black") == 0)
 		return COLOR_BLACK;
+	else if (strcasecmp(colorname, "normal") == 0)
+		return -1;
 
 	rcfile_error(N_("Color \"%s\" not understood"), colorname);
-	return -1;
+	return -2;
 }
 
 /* Parse the color string in the line at ptr, and add it to the current
@@ -753,11 +755,14 @@ bool parse_color_names(char *combostr, short *fg, short *bg, bool *bright)
 		*fg = color_to_short(combostr, bright);
 
 		/* If the specified foreground color is bad, ignore the regexes. */
-		if (*fg == -1)
+		if (*fg == -2)
 			return FALSE;
 	} else
 		*fg = -1;
 
+	if (*bg == -2)
+		*bg = -1;
+
 	return TRUE;
 }