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

Do not speak of "flags", but only of "options". 

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4744 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
Benno Schulenberg 2014-04-07 20:38:29 +00:00
parent 6f6ee844c7
commit 2f00c9da83
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -8,6 +8,8 @@
* src/{proto.h,files.c,global.c,nano.c,rcfile.c}: Drop the obsolete * src/{proto.h,files.c,global.c,nano.c,rcfile.c}: Drop the obsolete
argument of shortcut_init(), and remove two unneeded calls of it. argument of shortcut_init(), and remove two unneeded calls of it.
* src/global.c (shortcut_init): Allow M-J after an --enable-justify. * src/global.c (shortcut_init): Allow M-J after an --enable-justify.
* src/rcfile.c (parse_rcfile): The user documentation only speaks
of options, not of flags. Make the error messages conform.
2014-04-06 Benno Schulenberg <bensberg@justemail.net> 2014-04-06 Benno Schulenberg <bensberg@justemail.net>
* src/global.c (shortcut_init): Limit M-T (cut-till-end-of-file) to * src/global.c (shortcut_init): Limit M-T (cut-till-end-of-file) to

6
src/rcfile.c
View File

@ -1137,7 +1137,7 @@ void parse_rcfile(FILE *rcstream
continue; continue;
if (*ptr == '\0') { if (*ptr == '\0') {
rcfile_error(N_("Missing flag")); rcfile_error(N_("Missing option"));
continue; continue;
} }
@ -1279,7 +1279,7 @@ void parse_rcfile(FILE *rcstream
} else if (rcopts[i].flag != 0) } else if (rcopts[i].flag != 0)
UNSET(rcopts[i].flag); UNSET(rcopts[i].flag);
else else
rcfile_error(N_("Cannot unset flag \"%s\""), rcfile_error(N_("Cannot unset option \"%s\""),
rcopts[i].name); rcopts[i].name);
/* If undo/redo was enabled, reinitialize the lists. */ /* If undo/redo was enabled, reinitialize the lists. */
if (strcasecmp(rcopts[i].name, "undo") == 0) if (strcasecmp(rcopts[i].name, "undo") == 0)
@ -1288,7 +1288,7 @@ void parse_rcfile(FILE *rcstream
} }
} }
if (rcopts[i].name == NULL) if (rcopts[i].name == NULL)
rcfile_error(N_("Unknown flag \"%s\""), option); rcfile_error(N_("Unknown option \"%s\""), option);
} }
#ifndef DISABLE_COLOR #ifndef DISABLE_COLOR