Commit d08d72a0 authored by Benno Schulenberg's avatar Benno Schulenberg
Browse files

Checking for an open syntax first, before checking it is named "default".

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5721 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
No related merge requests found
Showing with 7 additions and 5 deletions
+7 -5
......@@ -3,6 +3,8 @@
--enable-tiny plus --enable-browser.
* src/rcfile.c: Tweak some comments and reshuffle some lines.
* src/rcfile.c (color_to_short): Elide a variable.
* src/rcfile.c (grab_and_store): First check that there is an
open syntax before checking that it is named "default".
2016-03-10 Benno Schulenberg <bensberg@justemail.net>
* src/rcfile.c (grab_and_store): Do not accept 'header" and 'magic'
......
......@@ -797,16 +797,16 @@ void grab_and_store(const char *kind, char *ptr, regexlisttype **storage)
{
regexlisttype *lastthing;
/* The default syntax doesn't take any file matching stuff. */
if (strcmp(live_syntax->name, "default") == 0 && *ptr != '\0') {
if (!opensyntax) {
rcfile_error(
N_("The \"default\" syntax does not accept '%s' regexes"), kind);
N_("A '%s' command requires a preceding 'syntax' command"), kind);
return;
}
if (!opensyntax) {
/* The default syntax doesn't take any file matching stuff. */
if (strcmp(live_syntax->name, "default") == 0 && *ptr != '\0') {
rcfile_error(
N_("A '%s' command requires a preceding 'syntax' command"), kind);
N_("The \"default\" syntax does not accept '%s' regexes"), kind);
return;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment