handle all syntaxes without associated colors in parse_rcfile()

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

diff --git a/ChangeLog b/ChangeLog
index 1d8b3ef7af77405572311ed8e96f915e11fd03b2..20c87eeca5bed3c7ce84ec2d5a48104524d39288 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -249,8 +249,6 @@ CVS code -
   parse_argument()
        - Rename variable ptr_bak to ptr_save, for consistency. (DLR)
   parse_syntax()
-       - Properly generate an error if we've read in a previous syntax
-         without any associated color commands. (DLR)
        - Don't generate an error if we find a duplicate syntax name,
          since we might be trying to override a syntax in the global
          nanorc with one in our local nanorc.  Instead, free any

diff --git a/src/rcfile.c b/src/rcfile.c
index 508fa4802d7ebf36571547bfde8e968be688ec32..68c1d3e1233dc165a1eaa81fbd6ac94eaff02a6d 100644 (file)
--- a/src/rcfile.c
+++ b/src/rcfile.c
@@ -282,11 +282,6 @@ void parse_syntax(char *ptr)
 
     assert(ptr != NULL);
 
-    if (endsyntax != NULL && endcolor == NULL) {
-       rcfile_error(N_("Previous syntax has no color commands"));
-       return;
-    }
-
     if (*ptr == '\0') {
        rcfile_error(N_("Missing syntax name"));
        return;
@@ -670,9 +665,12 @@ void parse_rcfile(FILE *rcstream
                        keyword);
            else
                parse_include(ptr);
-       } else if (strcasecmp(keyword, "syntax") == 0)
+       } else if (strcasecmp(keyword, "syntax") == 0) {
+           if (endsyntax != NULL && endcolor == NULL)
+               rcfile_error(
+                       N_("Previous syntax has no color commands"));
            parse_syntax(ptr);
-       else if (strcasecmp(keyword, "color") == 0)
+       } else if (strcasecmp(keyword, "color") == 0)
            parse_colors(ptr, FALSE);
        else if (strcasecmp(keyword, "icolor") == 0)
            parse_colors(ptr, TRUE);