1
1

options: stop recognizing and mentioning --quiet and 'set quiet'

Those options have been a no-op and obsolete for over a year.

Just continue to accept and ignore -q, for some "compatibility"
with Pico.
Этот коммит содержится в:
Benno Schulenberg 2018-12-10 10:36:09 +01:00
родитель 762cee242a
Коммит 3121ee4b2e
6 изменённых файлов: 3 добавлений и 21 удалений

Просмотреть файл

@ -226,9 +226,6 @@ similar to a chroot.
Preserve the XON and XOFF sequences (^Q and ^S) so they will be caught
by the terminal.
.TP
.BR \-q ", " \-\-quiet
Obsolete option. Recognized but ignored.
.TP
.BR \-r\ \fInumber ", " \-\-fill= \fInumber
Hard-wrap lines at column \fInumber\fP. If this value is 0 or less, wrapping
will occur at the width of the screen less \fInumber\fP columns, allowing
@ -273,7 +270,7 @@ continuing it over multiple screen lines. Since
this option last when using other options (e.g.\& 'nano \-wS$') or pass it
separately (e.g.\& 'nano \-wS \-$').
.TP
.BR \-b ", " \-e ", " \-f ", " \-j
.BR \-b ", " \-e ", " \-f ", " \-j ", " \-q
Ignored, for compatibility with Pico.
.SH TOGGLES

Просмотреть файл

@ -343,10 +343,6 @@ similar to a chroot.
Preserve the @kbd{^Q} (XON) and @kbd{^S} (XOFF) sequences so data being
sent to the editor can be stopped and started.
@item -q
@itemx --quiet
Obsolete option. Recognized but ignored.
@item -r @var{number}
@itemx --fill=@var{number}
Hard-wrap lines at column @var{number} (by inserting a newline character).
@ -422,6 +418,7 @@ separately (e.g.@: @code{nano -wS -$}).
@itemx -e
@itemx -f
@itemx -j
@itemx -q
Ignored, for compatibility with Pico.
@end table
@ -831,9 +828,6 @@ The default value is @t{"!.?"}.
Do quick status-bar blanking: status-bar messages will disappear after 1
keystroke instead of 25. Note that @option{constantshow} overrides this.
@item set quiet
Obsolete option. Recognized but ignored.
@item set quotestr "@var{regex}"
The email-quote string, used to justify email-quoted paragraphs. This
is an extended regular expression. The default value is

Просмотреть файл

@ -195,9 +195,6 @@ specfified closing punctuation, optionally followed by closing brackets
Do quick status-bar blanking: status-bar messages will disappear after 1
keystroke instead of 25. The option \fBconstantshow\fR overrides this.
.TP
.B set quiet
Obsolete option. Recognized but ignored.
.TP
.B set quotestr "\fIregex\fP"
The email-quote string, used to justify email-quoted paragraphs. This
is an extended regular expression. The default value is

Просмотреть файл

@ -1999,7 +1999,6 @@ int main(int argc, char **argv)
{"operatingdir", 1, NULL, 'o'},
#endif
{"preserve", 0, NULL, 'p'},
{"quiet", 0, NULL, 'q'},
#ifdef ENABLED_WRAPORJUSTIFY
{"fill", 1, NULL, 'r'},
#endif
@ -2243,10 +2242,6 @@ int main(int argc, char **argv)
case 'p':
SET(PRESERVE);
break;
#ifdef ENABLE_NANORC
case 'q': /* obsolete, ignored */
break;
#endif
#ifdef ENABLED_WRAPORJUSTIFY
case 'r':
if (!parse_num(optarg, &wrap_at)) {
@ -2306,6 +2301,7 @@ int main(int argc, char **argv)
case 'e':
case 'f':
case 'j':
case 'q':
break;
default:
printf(_("Type '%s -h' for a list of available options.\n"), argv[0]);

Просмотреть файл

@ -529,7 +529,6 @@ enum
WORD_BOUNDS,
NO_NEWLINES,
BOLD_TEXT,
QUIET,
SOFTWRAP,
POSITIONLOG,
LOCKING,

Просмотреть файл

@ -99,7 +99,6 @@ static const rcoption rcopts[] = {
{"locking", LOCKING},
{"matchbrackets", 0},
{"noconvert", NO_CONVERT},
{"quiet", QUIET},
{"showcursor", SHOW_CURSOR},
{"smarthome", SMART_HOME},
{"smooth", SMOOTH_SCROLL},