Get rid of unneeded call to usage() in main() when calling a flag for a function...

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

diff --git a/ChangeLog b/ChangeLog
index 0c85e1a115591d4a6e68de1446e469cc88162a64..ffdd06f871fc1e23ea41f40dfea1f974cfbb4f4f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -37,6 +37,8 @@ General
   main()
        - Alternate speller option no longer valid if DISABLE_SPELLER is
          active. (Rocco)
+       - Removed direct calls to usage() (#else) for -k (cut) or -s (speller)
+         options when these have been disabled. (Rocco)
        - Initialized kbinput to get around stupid compiler warning.
   nano_small_msg()
        - This function has been removed.  All references now call

diff --git a/nano.c b/nano.c
index be282806a1d932ec565c84503c9155c4527f612c..328ac1be084587e506de9a865185412c42be4a4d 100644 (file)
--- a/nano.c
+++ b/nano.c
@@ -2175,10 +2175,6 @@ int main(int argc, char *argv[])
        case 'k':
            SET(CUT_TO_END);
            break;
-#else
-       case 'k':
-           usage();            /* Oops!  You dont really have that option */
-           finish(1);
 #endif
        case 'l':
            UNSET(FOLLOW_SYMLINKS);
@@ -2201,10 +2197,6 @@ int main(int argc, char *argv[])
            alt_speller = nmalloc(strlen(optarg) + 1);
            strcpy(alt_speller, optarg);
            break;
-#else
-       case 's':
-           usage();            /* Oops!  You dont really have that option */
-           finish(1);
 #endif
        case 't':
            SET(TEMP_OPT);