tweaks: rename a function and a variable, for contrast and variety

master
Benno Schulenberg 2019-06-03 15:01:28 +02:00
parent 5e1f90d8fa
commit c025a60ce9
1 changed files with 4 additions and 4 deletions

View File

@ -289,7 +289,7 @@ bool nregcomp(const char *regex, int compile_flags)
/* Parse the next syntax name and its possible extension regexes from the /* Parse the next syntax name and its possible extension regexes from the
* line at ptr, and add it to the global linked list of color syntaxes. */ * line at ptr, and add it to the global linked list of color syntaxes. */
void parse_syntax(char *ptr, bool headers_only) void begin_a_syntax(char *ptr, bool headers_only)
{ {
char *nameptr = ptr; char *nameptr = ptr;
@ -583,12 +583,12 @@ void parse_one_include(char *file, syntaxtype *syntax)
/* Apply any stored extendsyntax commands. */ /* Apply any stored extendsyntax commands. */
while (extra != NULL) { while (extra != NULL) {
char *keyword = extra->data; char *keyword = extra->data;
char *ptr = parse_next_word(extra->data); char *therest = parse_next_word(extra->data);
nanorc = extra->filename; nanorc = extra->filename;
lineno = extra->lineno; lineno = extra->lineno;
if (!parse_syntax_commands(keyword, ptr)) if (!parse_syntax_commands(keyword, therest))
rcfile_error(N_("Command \"%s\" not understood"), keyword); rcfile_error(N_("Command \"%s\" not understood"), keyword);
extra = extra->next; extra = extra->next;
@ -1078,7 +1078,7 @@ void parse_rcfile(FILE *rcstream, bool syntax_only, bool headers_only)
if (opensyntax && lastcolor == NULL && live_syntax->filename == NULL) if (opensyntax && lastcolor == NULL && live_syntax->filename == NULL)
rcfile_error(N_("Syntax \"%s\" has no color commands"), rcfile_error(N_("Syntax \"%s\" has no color commands"),
live_syntax->name); live_syntax->name);
parse_syntax(ptr, headers_only); begin_a_syntax(ptr, headers_only);
} }
} else if (strcasecmp(keyword, "header") == 0) { } else if (strcasecmp(keyword, "header") == 0) {
if (headers_only || !syntax_only) if (headers_only || !syntax_only)