in usage(), fix inaccuracies in the usage example

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

diff --git a/ChangeLog b/ChangeLog
index ec01bd62745a8ad36caf2a022239ccfbff50cfdf..ae7171504b32cea2f1a0d9956972bdce6f2c4290 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -148,6 +148,8 @@ CVS code -
          Schulenberg)
        - Remove redundant key checks. (DLR)
 - nano.c:
+  usage()
+       - Fix inaccuracies in the usage example. (DLR)
   renumber()
        - Remove invalid assert. (DLR, found by Filipe Moreira)
 - nano.h:

diff --git a/src/nano.c b/src/nano.c
index 02c4c2bf365541e536a292e6bf16457e761465f0..c2e60dda83170f939716e4027eef83d204e9d48e 100644 (file)
--- a/src/nano.c
+++ b/src/nano.c
@@ -721,15 +721,14 @@ void print1opt_full(const char *shortflag
 /* Explain how to properly use nano and its command line options. */
 void usage(void)
 {
-#ifdef HAVE_GETOPT_LONG
+    printf(_("Usage: nano [OPTIONS] [[+LINE[,COLUMN]] FILE]...\n\n"));
     printf(
-       _("Usage: nano [+LINE,COLUMN] [GNU long option] [option] [file]\n\n"));
-    printf(_("Option\t\tLong option\t\tMeaning\n"));
+#ifdef HAVE_GETOPT_LONG
+       _("Option\t\tGNU long option\t\tMeaning\n")
 #else
-    printf(_("Usage: nano [+LINE,COLUMN] [option] [file]\n\n"));
-    printf(_("Option\t\tMeaning\n"));
+       _("Option\t\tMeaning\n")
 #endif
-
+       );
     print1opt("-h, -?", "--help", N_("Show this message"));
     print1opt(_("+LINE,COLUMN"), "",
        N_("Start at line LINE, column COLUMN"));