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.
Этот коммит содержится в:
родитель
762cee242a
Коммит
3121ee4b2e
@ -226,9 +226,6 @@ similar to a chroot.
|
|||||||
Preserve the XON and XOFF sequences (^Q and ^S) so they will be caught
|
Preserve the XON and XOFF sequences (^Q and ^S) so they will be caught
|
||||||
by the terminal.
|
by the terminal.
|
||||||
.TP
|
.TP
|
||||||
.BR \-q ", " \-\-quiet
|
|
||||||
Obsolete option. Recognized but ignored.
|
|
||||||
.TP
|
|
||||||
.BR \-r\ \fInumber ", " \-\-fill= \fInumber
|
.BR \-r\ \fInumber ", " \-\-fill= \fInumber
|
||||||
Hard-wrap lines at column \fInumber\fP. If this value is 0 or less, wrapping
|
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
|
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
|
this option last when using other options (e.g.\& 'nano \-wS$') or pass it
|
||||||
separately (e.g.\& 'nano \-wS \-$').
|
separately (e.g.\& 'nano \-wS \-$').
|
||||||
.TP
|
.TP
|
||||||
.BR \-b ", " \-e ", " \-f ", " \-j
|
.BR \-b ", " \-e ", " \-f ", " \-j ", " \-q
|
||||||
Ignored, for compatibility with Pico.
|
Ignored, for compatibility with Pico.
|
||||||
|
|
||||||
.SH TOGGLES
|
.SH TOGGLES
|
||||||
|
@ -343,10 +343,6 @@ similar to a chroot.
|
|||||||
Preserve the @kbd{^Q} (XON) and @kbd{^S} (XOFF) sequences so data being
|
Preserve the @kbd{^Q} (XON) and @kbd{^S} (XOFF) sequences so data being
|
||||||
sent to the editor can be stopped and started.
|
sent to the editor can be stopped and started.
|
||||||
|
|
||||||
@item -q
|
|
||||||
@itemx --quiet
|
|
||||||
Obsolete option. Recognized but ignored.
|
|
||||||
|
|
||||||
@item -r @var{number}
|
@item -r @var{number}
|
||||||
@itemx --fill=@var{number}
|
@itemx --fill=@var{number}
|
||||||
Hard-wrap lines at column @var{number} (by inserting a newline character).
|
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 -e
|
||||||
@itemx -f
|
@itemx -f
|
||||||
@itemx -j
|
@itemx -j
|
||||||
|
@itemx -q
|
||||||
Ignored, for compatibility with Pico.
|
Ignored, for compatibility with Pico.
|
||||||
|
|
||||||
@end table
|
@end table
|
||||||
@ -831,9 +828,6 @@ The default value is @t{"!.?"}.
|
|||||||
Do quick status-bar blanking: status-bar messages will disappear after 1
|
Do quick status-bar blanking: status-bar messages will disappear after 1
|
||||||
keystroke instead of 25. Note that @option{constantshow} overrides this.
|
keystroke instead of 25. Note that @option{constantshow} overrides this.
|
||||||
|
|
||||||
@item set quiet
|
|
||||||
Obsolete option. Recognized but ignored.
|
|
||||||
|
|
||||||
@item set quotestr "@var{regex}"
|
@item set quotestr "@var{regex}"
|
||||||
The email-quote string, used to justify email-quoted paragraphs. This
|
The email-quote string, used to justify email-quoted paragraphs. This
|
||||||
is an extended regular expression. The default value is
|
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
|
Do quick status-bar blanking: status-bar messages will disappear after 1
|
||||||
keystroke instead of 25. The option \fBconstantshow\fR overrides this.
|
keystroke instead of 25. The option \fBconstantshow\fR overrides this.
|
||||||
.TP
|
.TP
|
||||||
.B set quiet
|
|
||||||
Obsolete option. Recognized but ignored.
|
|
||||||
.TP
|
|
||||||
.B set quotestr "\fIregex\fP"
|
.B set quotestr "\fIregex\fP"
|
||||||
The email-quote string, used to justify email-quoted paragraphs. This
|
The email-quote string, used to justify email-quoted paragraphs. This
|
||||||
is an extended regular expression. The default value is
|
is an extended regular expression. The default value is
|
||||||
|
@ -1999,7 +1999,6 @@ int main(int argc, char **argv)
|
|||||||
{"operatingdir", 1, NULL, 'o'},
|
{"operatingdir", 1, NULL, 'o'},
|
||||||
#endif
|
#endif
|
||||||
{"preserve", 0, NULL, 'p'},
|
{"preserve", 0, NULL, 'p'},
|
||||||
{"quiet", 0, NULL, 'q'},
|
|
||||||
#ifdef ENABLED_WRAPORJUSTIFY
|
#ifdef ENABLED_WRAPORJUSTIFY
|
||||||
{"fill", 1, NULL, 'r'},
|
{"fill", 1, NULL, 'r'},
|
||||||
#endif
|
#endif
|
||||||
@ -2243,10 +2242,6 @@ int main(int argc, char **argv)
|
|||||||
case 'p':
|
case 'p':
|
||||||
SET(PRESERVE);
|
SET(PRESERVE);
|
||||||
break;
|
break;
|
||||||
#ifdef ENABLE_NANORC
|
|
||||||
case 'q': /* obsolete, ignored */
|
|
||||||
break;
|
|
||||||
#endif
|
|
||||||
#ifdef ENABLED_WRAPORJUSTIFY
|
#ifdef ENABLED_WRAPORJUSTIFY
|
||||||
case 'r':
|
case 'r':
|
||||||
if (!parse_num(optarg, &wrap_at)) {
|
if (!parse_num(optarg, &wrap_at)) {
|
||||||
@ -2306,6 +2301,7 @@ int main(int argc, char **argv)
|
|||||||
case 'e':
|
case 'e':
|
||||||
case 'f':
|
case 'f':
|
||||||
case 'j':
|
case 'j':
|
||||||
|
case 'q':
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
printf(_("Type '%s -h' for a list of available options.\n"), argv[0]);
|
printf(_("Type '%s -h' for a list of available options.\n"), argv[0]);
|
||||||
|
@ -529,7 +529,6 @@ enum
|
|||||||
WORD_BOUNDS,
|
WORD_BOUNDS,
|
||||||
NO_NEWLINES,
|
NO_NEWLINES,
|
||||||
BOLD_TEXT,
|
BOLD_TEXT,
|
||||||
QUIET,
|
|
||||||
SOFTWRAP,
|
SOFTWRAP,
|
||||||
POSITIONLOG,
|
POSITIONLOG,
|
||||||
LOCKING,
|
LOCKING,
|
||||||
|
@ -99,7 +99,6 @@ static const rcoption rcopts[] = {
|
|||||||
{"locking", LOCKING},
|
{"locking", LOCKING},
|
||||||
{"matchbrackets", 0},
|
{"matchbrackets", 0},
|
||||||
{"noconvert", NO_CONVERT},
|
{"noconvert", NO_CONVERT},
|
||||||
{"quiet", QUIET},
|
|
||||||
{"showcursor", SHOW_CURSOR},
|
{"showcursor", SHOW_CURSOR},
|
||||||
{"smarthome", SMART_HOME},
|
{"smarthome", SMART_HOME},
|
||||||
{"smooth", SMOOTH_SCROLL},
|
{"smooth", SMOOTH_SCROLL},
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user