mirrors/nano
1
0
Fork 0
mirror of git://git.sv.gnu.org/nano.git synced 2024-11-25 06:09:38 +03:00
Code Issues Packages Projects Releases Wiki Activity

"Closing" an extended syntax again, to prevent sneakily extending

Browse Source 
the last-defined syntax.


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5700 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
This commit is contained in:
Benno Schulenberg 2016-02-29 12:04:22 +00:00
parent 773fc447df
commit 85e166b0f2
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,7 +1,9 @@
2016-02-28 Benno Schulenberg <bensberg@justemail.net>
2016-02-29 Benno Schulenberg <bensberg@justemail.net>
* src/nano.h, src/rcfile.c, src/color.c: Rename a struct member.
* src/rcfile.c (parse_rcfile): Don't allocate struct for none syntax.
* src/rcfile.c (parse_rcfile): Don't allocate a struct for the "none"
syntax, and thus prevent it from being extended.
* src/nano.h, src/rcfile.c: Arrange some things more orderly.
* src/rcfile.c (parse_rcfile): Close an extended syntax again.
2016-02-28 Benno Schulenberg <bensberg@justemail.net>
* src/rcfile.c (parse_header_exp): Don't continue when something is

2
src/rcfile.c
View File

@ -1063,6 +1063,7 @@ void parse_rcfile(FILE *rcstream
if (ts == NULL) {
rcfile_error(N_("Could not find syntax \"%s\" to extend"), syntaxname);
opensyntax = FALSE;
continue;
} else {
opensyntax = TRUE;
@ -1142,6 +1143,7 @@ void parse_rcfile(FILE *rcstream
if (end_syn_save != NULL) {
endsyntax = end_syn_save;
end_syn_save = NULL;
opensyntax = FALSE;
}
#endif