ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

help: don't list the obsoleted -O and -S options in the --help output 

And don't bother to recognize them either.
master
Benno Schulenberg 2019-03-10 19:03:43 +01:00
parent 4205567bb1
commit 74752686f4
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/nano.c
View File

@ -814,7 +814,6 @@ void usage(void)
print_opt("-N", "--noconvert", print_opt("-N", "--noconvert",
N_("Don't convert files from DOS/Mac format")); N_("Don't convert files from DOS/Mac format"));
#endif #endif
print_opt("-O", "--morespace", N_("Use one more line for editing"));
#ifdef ENABLE_HISTORIES #ifdef ENABLE_HISTORIES
if (!ISSET(RESTRICTED)) if (!ISSET(RESTRICTED))
print_opt("-P", "--positionlog", print_opt("-P", "--positionlog",
@ -826,9 +825,6 @@ void usage(void)
#endif #endif
if (!ISSET(RESTRICTED)) if (!ISSET(RESTRICTED))
print_opt("-R", "--restricted", N_("Restricted mode")); print_opt("-R", "--restricted", N_("Restricted mode"));
#ifndef NANO_TINY
print_opt("-S", "--smooth", N_("Scroll by line instead of half-screen"));
#endif
print_opt(_("-T <#cols>"), _("--tabsize=<#cols>"), print_opt(_("-T <#cols>"), _("--tabsize=<#cols>"),
N_("Set width of a tab to #cols columns")); N_("Set width of a tab to #cols columns"));
print_opt("-U", "--quickblank", N_("Do quick statusbar blanking")); print_opt("-U", "--quickblank", N_("Do quick statusbar blanking"));
@ -1972,7 +1968,6 @@ int main(int argc, char **argv)
#ifdef ENABLED_WRAPORJUSTIFY #ifdef ENABLED_WRAPORJUSTIFY
{"trimblanks", 0, NULL, 'M'}, {"trimblanks", 0, NULL, 'M'},
#endif #endif
{"morespace", 0, NULL, 'O'},
#ifdef ENABLE_JUSTIFY #ifdef ENABLE_JUSTIFY
{"quotestr", 1, NULL, 'Q'}, {"quotestr", 1, NULL, 'Q'},
#endif #endif
@ -2028,6 +2023,7 @@ int main(int argc, char **argv)
{"historylog", 0, NULL, 'H'}, {"historylog", 0, NULL, 'H'},
{"guidestripe", 1, NULL, 'J'}, {"guidestripe", 1, NULL, 'J'},
{"noconvert", 0, NULL, 'N'}, {"noconvert", 0, NULL, 'N'},
{"morespace", 0, NULL, 'O'},
{"positionlog", 0, NULL, 'P'}, {"positionlog", 0, NULL, 'P'},
{"smooth", 0, NULL, 'S'}, {"smooth", 0, NULL, 'S'},
{"wordbounds", 0, NULL, 'W'}, {"wordbounds", 0, NULL, 'W'},
@ -2161,11 +2157,11 @@ int main(int argc, char **argv)
case 'N': case 'N':
SET(NO_CONVERT); SET(NO_CONVERT);
break; break;
#endif
case 'O': case 'O':
fprintf(stderr, N_("Option %s is ignored; it is the default\n"), fprintf(stderr, N_("Option %s is ignored; it is the default\n"),
"morespace"); "morespace");
break; break;
#endif
#ifdef ENABLE_HISTORIES #ifdef ENABLE_HISTORIES
case 'P': case 'P':
SET(POSITIONLOG); SET(POSITIONLOG);