ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Removing two superfluous #ifndefs. 

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5174 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
Benno Schulenberg 2015-04-03 15:57:22 +00:00
parent 5ac108188d
commit de53c53c6e
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -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),

11
src/rcfile.c
View File

@ -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);