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

diff --git a/ChangeLog b/ChangeLog
index 4cfd46ab75ad8477e8317031635cee0310b1bdfa..f4a13013093589cc7fded37b01bb133e34786bdd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,8 @@
        * 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.
        * 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>
        * src/global.c (shortcut_init): Limit M-T (cut-till-end-of-file) to

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