per Daniel Richard G.'s patch, in parse_rcfile(), add missing

ENABLE_COLOR #ifdef around the second check for a syntax with no color
commands, to fix compilation without color support

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

diff --git a/ChangeLog b/ChangeLog
index d38b3271f08d907b846657b75db519194216b35a..6401cd5381623589dddacdef129ce36ad8cdd810 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -109,6 +109,11 @@ CVS code -
 - nano.h:
        - Remove the manual disabling of color support if regex.h isn't
          found, as configure.ac now handles that. (DLR)
+- rcfile.c:
+  parse_rcfile()
+       - Add missing ENABLE_COLOR #ifdef around the second check for a
+         syntax with no color commands, to fix compilation without
+         color support. (Daniel Richard G.)
 - search.c:
   replace_regexp()
        - Remove unnecessary casting of c to int. (DLR)

diff --git a/src/rcfile.c b/src/rcfile.c
index 9ede47f11a3d8827d1c4787cd34c0859723f0730..002f23f1e5ac63e28cda172d027bb847178c52aa 100644 (file)
--- a/src/rcfile.c
+++ b/src/rcfile.c
@@ -834,9 +834,11 @@ void parse_rcfile(FILE *rcstream
            rcfile_error(N_("Unknown flag \"%s\""), option);
     }
 
+#ifdef ENABLE_COLOR
     if (endsyntax != NULL && endcolor == NULL)
        rcfile_error(N_("Syntax \"%s\" has no color commands"),
                endsyntax->desc);
+#endif
 
     free(buf);
     fclose(rcstream);