mirrors/nano
1
0
Fork 0
mirror of git://git.sv.gnu.org/nano.git synced 2024-11-22 21:01:24 +03:00
Code Issues Packages Projects Releases Wiki Activity

handle all syntaxes without associated colors in parse_rcfile()

Browse Source 
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3574 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
This commit is contained in:
David Lawrence Ramsey 2006-05-26 13:27:28 +00:00
parent 0b4920adc9
commit 558d34f5ba
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

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

12
src/rcfile.c
View File

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