per Ken Tyler's suggestion, simplify do_gotoline_msg further; also, in

usage(), properly mention the support for "[+LINE,COLUMN]" at the
command line when HAVE_GETOPT_LONG isn't defined

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2848 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

diff --git a/ChangeLog b/ChangeLog
index 02a04b550ef1783124f8b40313743346e7d72256..4379458ead9a7f3e0fe40f1db1363f2c0cef4a6e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -34,8 +34,11 @@ CVS code -
          latter case is now handled elsewhere. (DLR)
 - global.c:
   shortcut_init()
-       - Simplify wording of nano_gotoline_msg. (Jordi)
+       - Simplify wording of nano_gotoline_msg. (Jordi and Ken Tyler)
 - nano.c:
+  usage()
+       - Properly mention the support for "[+LINE,COLUMN]" on the
+         command line when HAVE_GETOPT_LONG isn't defined. (DLR)
   do_verbatim_input()
        - If constant cursor position display is on, make sure the
          cursor position is displayed properly when we finish. (DLR)

diff --git a/src/global.c b/src/global.c
index 12ec5dd3674c25f0475f58ef2a1592f4532aa509..06300044fae2be27620136e0138275b1059c6f06 100644 (file)
--- a/src/global.c
+++ b/src/global.c
@@ -263,7 +263,7 @@ void shortcut_init(bool unjustify)
     const char *nano_spell_msg =
        N_("Invoke the spell checker, if available");
     const char *nano_gotoline_msg =
-       N_("Go to a specific line and column number");
+       N_("Go to a line and column number");
     const char *nano_replace_msg = N_("Replace text within the editor");
 #ifndef NANO_SMALL
     const char *nano_mark_msg = N_("Mark text at the cursor position");

diff --git a/src/nano.c b/src/nano.c
index 266dd74c3cfd4f910415f04690735ef676402efd..37cbf21c10f93b80ff1bfda6a7313b783b416ef5 100644 (file)
--- a/src/nano.c
+++ b/src/nano.c
@@ -985,7 +985,7 @@ void usage(void)
        _("Usage: nano [+LINE,COLUMN] [GNU long option] [option] [file]\n\n"));
     printf(_("Option\t\tLong option\t\tMeaning\n"));
 #else
-    printf(_("Usage: nano [+LINE] [option] [file]\n\n"));
+    printf(_("Usage: nano [+LINE,COLUMN] [option] [file]\n\n"));
     printf(_("Option\t\tMeaning\n"));
 #endif