Removing two superfluous #ifndefs.

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

diff --git a/ChangeLog b/ChangeLog
index ce73318f16ff249c16139901e775f54083db061a..3b5080905bf237400c33871f910a1e353ecd99a4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 2015-04-03  Benno Schulenberg  <bensberg@justemail.net>
        * README: Update text to the fifth milestone: 2.4.x, plus tweaks.
+       * src/rcfile.c: Remove two superfluous (because nested) #ifndefs.
 
 2015-03-28  Benno Schulenberg  <bensberg@justemail.net>
        * src/search.c (search_init_globals, search_replace_abort),

diff --git a/src/rcfile.c b/src/rcfile.c
index 502e26a304560bec1892b1266cf25f2b10e393b9..51ff6bb926b454d5a78b04906880c07eaa15b143 100644 (file)
--- a/src/rcfile.c
+++ b/src/rcfile.c
@@ -601,11 +601,7 @@ static void _parse_include(char *file)
     fprintf(stderr, "Parsing file \"%s\"\n", file);
 #endif
 
-    parse_rcfile(rcstream
-#ifndef DISABLE_COLOR
-       , TRUE
-#endif
-       );
+    parse_rcfile(rcstream, TRUE);
 }
 
 void parse_include(char *ptr)
@@ -907,7 +903,6 @@ void parse_header_exp(char *ptr)
     }
 }
 
-#ifndef DISABLE_COLOR
 /* Parse the magic regexes that may influence the choice of syntax. */
 void parse_magic_exp(char *ptr)
 {
@@ -973,9 +968,8 @@ void parse_magic_exp(char *ptr)
     }
 #endif /* HAVE_LIBMAGIC */
 }
-#endif /* !DISABLE_COLOR */
 
-/* Parse the linter requested for this syntax.  Simple? */
+/* Parse the linter requested for this syntax. */
 void parse_linter(char *ptr)
 {
     assert(ptr != NULL);
@@ -1001,6 +995,7 @@ void parse_linter(char *ptr)
        endsyntax->linter = mallocstrcpy(syntaxes->linter, ptr);
 }
 
+/* Parse the formatter requested for this syntax. */
 void parse_formatter(char *ptr)
 {
     assert(ptr != NULL);