From de53c53c6e63d0af1a24e295ae7f38a93854050d Mon Sep 17 00:00:00 2001 From: Benno Schulenberg Date: Fri, 3 Apr 2015 15:57:22 +0000 Subject: [PATCH] Removing two superfluous #ifndefs. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5174 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- ChangeLog | 1 + src/rcfile.c | 11 +++-------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index ce73318f..3b508090 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,6 @@ 2015-04-03 Benno Schulenberg * 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 * src/search.c (search_init_globals, search_replace_abort), diff --git a/src/rcfile.c b/src/rcfile.c index 502e26a3..51ff6bb9 100644 --- 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); -- 2.39.5