Better fix hopefully for color issue

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@1430 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

diff --git a/ChangeLog b/ChangeLog
index 89d3745b519bcf6941dd6d656d2f137849f3e015..f5d94187d84ef43f2b78740431858eef05434fc6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,7 +11,8 @@ CVS code
   colortoint()
        - Don't bomb after invalid color and print bad color name
          (David Benbennick).
-       - And reset mcolor to -1.
+  colortoint, parse_colors()
+       - Don't add strings with invalid fg colors at all.
 - nano.1, nano.1.html:
        - Add initialization file comments, change some options from 
          bracketed to underlined to emphasize that they are not 

diff --git a/rcfile.c b/rcfile.c
index dade1c4371115e3be7ac5790dd03f9d56510febd..03f5dfeede70eb572158258b498d516aec106272 100644 (file)
--- a/rcfile.c
+++ b/rcfile.c
@@ -361,6 +361,10 @@ void parse_colors(char *ptr)
 
     fg = colortoint(fgstr, &bright);
 
+    /* Don't try and parse screwed up fg colors */
+    if (fg == -1)
+       return;
+
     if (syntaxes == NULL) {
        rcfile_error(_("Cannot add a color directive without a syntax line"));
        return;