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

docs, usage: make it clear that the argument of --quotestr is a regex 

In the past, the argument could be either a regex or a literal string,
so the wording was kind of vague.  But nowadays we can count on having
regex support (through gnulib), so be more precise in the description.
master
Benno Schulenberg 2018-05-22 18:25:59 +02:00
parent d9ba6c10d2
commit 299e710845
4 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/nano.1
View File

@ -122,9 +122,11 @@ Use the blank line below the title bar as extra editing space.
For the 200 most recent files, log the last position of the cursor,
and place it at that position again upon reopening such a file.
.TP
.BR "\-Q ""\fIcharacters\fB""" ", " "\-\-quotestr=""" \fIcharacters """
Set the quoting string for justifying. The default is
\fB"^([\ \\t]*[#:>|}])+"\fP. Note that \fB\\t\fP stands for an actual Tab.
.BR "\-Q ""\fIregex\fB""" ", " "\-\-quotestr=""" \fIregex """
Set the regular expression for matching the quoting part of a line.
This is used when justifying.
The default value is \fB"^([\ \\t]*[#:>|}])+"\fP.
Note that \fB\\t\fP stands for an actual Tab.
.TP
.BR \-R ", " \-\-restricted
Restricted mode: don't read or write to any file not specified on the

10
doc/nano.texi
View File

@ -218,10 +218,10 @@ Use the blank line below the title bar as extra editing space.
For the 200 most recent files, log the last position of the cursor,
and place it at that position again upon reopening such a file.
@item -Q "@var{characters}"
@itemx --quotestr="@var{characters}"
Set the quoting string for justifying. The default value is
@t{"^([@w{ }\t]*[#:>|@}])+"}.
@item -Q "@var{regex}"
@itemx --quotestr="@var{regex}"
Set the regular expression for matching the quoting part of a line, used
when justifying. The default value is @t{"^([@w{ }\t]*[#:>|@}])+"}.
Note that @code{\t} stands for a literal Tab character.
@item -R
@ -845,7 +845,7 @@ keystroke instead of 25. Note that @option{constantshow} overrides this.
@item set quiet
Obsolete option. Recognized but ignored.
@item set quotestr "@var{string}"
@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
@t{"^([@w{ }\t]*[#:>|@}])+"}.

2
doc/nanorc.5
View File

@ -201,7 +201,7 @@ keystroke instead of 25. The option \fBconstantshow\fR overrides this.
.B set quiet
Obsolete option. Recognized but ignored.
.TP
.B set quotestr "\fIstring\fP"
.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
"\fB^([\ \\t]*[#:>|}])+\fP". Note that \fB\\t\fR stands for an actual

3
src/nano.c
View File

@ -818,7 +818,8 @@ void usage(void)
N_("Log & read location of cursor position"));
#endif
#ifdef ENABLE_JUSTIFY
print_opt(_("-Q <str>"), _("--quotestr=<str>"), N_("Quoting string"));
print_opt(_("-Q <regex>"), _("--quotestr=<regex>"),
N_("Regular expression to match quoting"));
#endif
if (!ISSET(RESTRICTED))
print_opt("-R", "--restricted", N_("Restricted mode"));