Commit c3a11fb7 authored by Benno Schulenberg's avatar Benno Schulenberg
Browse files

options: remove '--quiet' and 'set quiet', because they hide problems

If the user uses a single version of nano, they have no need for
--quiet.  If they do sometimes use an older version and don't want
to see the warnings, they can use 2>/dev/null (they could make an
alias for that and put it before the call of nano).
No related merge requests found
Showing with 5 additions and 25 deletions
+5 -25
...@@ -217,8 +217,7 @@ Preserve the XON and XOFF sequences (^Q and ^S) so they will be caught ...@@ -217,8 +217,7 @@ 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 .BR \-q ", " \-\-quiet
Do not report errors in the \fInanorc\fP files nor ask them to be Obsolete option. Recognized but ignored.
acknowledged by pressing Enter at startup.
.TP .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
......
...@@ -335,8 +335,7 @@ sent to the editor can be stopped and started. ...@@ -335,8 +335,7 @@ sent to the editor can be stopped and started.
@item -q @item -q
@itemx --quiet @itemx --quiet
Do not report errors in the nanorc file nor ask them to be acknowledged Obsolete option. Recognized but ignored.
by pressing @kbd{Enter} at startup.
@item -r @var{number} @item -r @var{number}
@itemx --fill=@var{number} @itemx --fill=@var{number}
...@@ -828,9 +827,7 @@ Do quick status-bar blanking: status-bar messages will disappear after 1 ...@@ -828,9 +827,7 @@ 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 @item set quiet
When set, @command{nano} will not report errors in the nanorc file nor ask them Obsolete option. Recognized but ignored.
to be acknowledged by pressing @kbd{Enter} at startup. If this option is used, it
should be placed at the top of the file to be fully effective.
@item set quotestr "@var{string}" @item set quotestr "@var{string}"
The email-quote string, used to justify email-quoted paragraphs. This The email-quote string, used to justify email-quoted paragraphs. This
......
...@@ -195,9 +195,7 @@ Do quick status-bar blanking: status-bar messages will disappear after 1 ...@@ -195,9 +195,7 @@ 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 .B set quiet
\fBnano\fP will not report errors in the \fInanorc\fP file nor ask them Obsolete option. Recognized but ignored.
to be acknowledged by pressing Enter at startup. If this is used, it
should be placed at the top of the file to be fully effective.
.TP .TP
.B set quotestr "\fIstring\fP" .B set quotestr "\fIstring\fP"
The email-quote string, used to justify email-quoted paragraphs. This The email-quote string, used to justify email-quoted paragraphs. This
......
...@@ -15,11 +15,6 @@ ...@@ -15,11 +15,6 @@
## its end. For example, for the "brackets" option, ""')>]}" will match ## its end. For example, for the "brackets" option, ""')>]}" will match
## ", ', ), >, ], and }. ## ", ', ), >, ], and }.
## Silently ignore problems with unknown directives in the nanorc file.
## Useful when your nanorc file might be read on systems with multiple
## versions of nano installed (e.g. your home directory is on NFS).
# set quiet
## When soft line wrapping is enabled, make it wrap lines at blanks ## When soft line wrapping is enabled, make it wrap lines at blanks
## (tabs and spaces) instead of always at the edge of the screen. ## (tabs and spaces) instead of always at the edge of the screen.
# set atblanks # set atblanks
......
...@@ -880,11 +880,6 @@ void usage(void) ...@@ -880,11 +880,6 @@ void usage(void)
N_("Set operating directory")); N_("Set operating directory"));
#endif #endif
print_opt("-p", "--preserve", N_("Preserve XON (^Q) and XOFF (^S) keys")); print_opt("-p", "--preserve", N_("Preserve XON (^Q) and XOFF (^S) keys"));
#ifdef ENABLE_NANORC
if (!ISSET(RESTRICTED))
print_opt("-q", "--quiet",
N_("Silently ignore startup issues like rc file errors"));
#endif
#ifdef ENABLED_WRAPORJUSTIFY #ifdef ENABLED_WRAPORJUSTIFY
print_opt(_("-r <#cols>"), _("--fill=<#cols>"), print_opt(_("-r <#cols>"), _("--fill=<#cols>"),
N_("Set hard-wrapping point at column #cols")); N_("Set hard-wrapping point at column #cols"));
...@@ -2166,8 +2161,7 @@ int main(int argc, char **argv) ...@@ -2166,8 +2161,7 @@ int main(int argc, char **argv)
SET(PRESERVE); SET(PRESERVE);
break; break;
#ifdef ENABLE_NANORC #ifdef ENABLE_NANORC
case 'q': case 'q': /* obsolete, ignored */
SET(QUIET);
break; break;
#endif #endif
#ifdef ENABLED_WRAPORJUSTIFY #ifdef ENABLED_WRAPORJUSTIFY
......
...@@ -141,9 +141,6 @@ void rcfile_error(const char *msg, ...) ...@@ -141,9 +141,6 @@ void rcfile_error(const char *msg, ...)
{ {
va_list ap; va_list ap;
if (ISSET(QUIET))
return;
if (lineno > 0) if (lineno > 0)
fprintf(stderr, _("Error in %s on line %lu: "), nanorc, (unsigned long)lineno); fprintf(stderr, _("Error in %s on line %lu: "), nanorc, (unsigned long)lineno);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment