nano

commit 2f00c9da8341ccc065a58592fa0154c509daa2aa
parent 6f6ee844c7ee4b9e4f7010078ee2fd85f7920b32
Author: Benno Schulenberg <bensberg@justemail.net>
Date:   Mon,  7 Apr 2014 20:38:29 +0000

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

Diffstat:
M
ChangeLog
 | 
2
++
M
src/rcfile.c
 | 
6
+++---

2 files changed, 5 insertions(+), 3 deletions(-)
diff --git 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
@@ -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