From 3628863f90d9ad064a32bff8bead419ad8b039a8 Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <bensberg@telfort.nl>
Date: Mon, 21 May 2018 20:05:38 +0200
Subject: [PATCH] docs: remove mention of the quotestr for when regex support
 is lacking

Since version 2.8.0, nano will use (wnen needed) the regex routines
from gnulib, so mentioning the quotestr for when regex support is
lacking, has been obsolete and pointless for more than a year.

Also, remove some superfluous backslashes, use a non-breaking space
in the texinfo document, and order the regex consistently.
---
 doc/nano.1           | 4 +---
 doc/nano.texi        | 9 +++------
 doc/nanorc.5         | 6 ++----
 doc/sample.nanorc.in | 8 ++------
 4 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/doc/nano.1 b/doc/nano.1
index c1c14f88..891cbc85 100644
--- a/doc/nano.1
+++ b/doc/nano.1
@@ -124,9 +124,7 @@ 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 if extended regular expression support is
-available, or \fB">\ "\fP otherwise.  Note that \fB\\t\fP stands for a
-Tab.
+\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
diff --git a/doc/nano.texi b/doc/nano.texi
index 4114860c..9da7fa97 100644
--- a/doc/nano.texi
+++ b/doc/nano.texi
@@ -221,8 +221,7 @@ 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{"^([ \t]*[|>:@}#])+"} if extended regular expression support
-is available, and @t{"> "} otherwise.
+@t{"^([@w{ }\t]*[#:>|@}])+"}.
 Note that @code{\t} stands for a literal Tab character.
 
 @item -R
@@ -848,10 +847,8 @@ Obsolete option.  Recognized but ignored.
 
 @item set quotestr "@var{string}"
 The email-quote string, used to justify email-quoted paragraphs.  This
-is an extended regular expression if your system supports them,
-otherwise a literal string.  The default value is
-@t{"^([ \\t]*[#:>\\|@}])+"} if you have extended regular expression
-support, and @t{"> "} otherwise.
+is an extended regular expression.  The default value is
+@t{"^([@w{ }\t]*[#:>|@}])+"}.
 Note that @code{\t} stands for a literal Tab character.
 
 @item set rebinddelete
diff --git a/doc/nanorc.5 b/doc/nanorc.5
index e4751b09..2bdbfd62 100644
--- a/doc/nanorc.5
+++ b/doc/nanorc.5
@@ -203,10 +203,8 @@ Obsolete option.  Recognized but ignored.
 .TP
 .B set quotestr "\fIstring\fP"
 The email-quote string, used to justify email-quoted paragraphs.  This
-is an extended regular expression if your system supports them,
-otherwise a literal string.  The default value is
-"\fB^([\ \\t]*[#:>\\|}])+\fP" if you have extended regular expression
-support, and "\fB>\ \fP" otherwise.  Note that '\\t' stands for a literal
+is an extended regular expression.  The default value is
+"\fB^([\ \\t]*[#:>|}])+\fP".  Note that \fB\\t\fR stands for an actual
 Tab character.
 .TP
 .B set rebinddelete
diff --git a/doc/sample.nanorc.in b/doc/sample.nanorc.in
index c3018bbc..263abd1a 100644
--- a/doc/sample.nanorc.in
+++ b/doc/sample.nanorc.in
@@ -125,12 +125,8 @@
 # set quickblank
 
 ## The email-quote string, used to justify email-quoted paragraphs.
-## This is an extended regular expression if your system supports them,
-## otherwise a literal string.
-## If you have extended regular expression support, the default is:
-# set quotestr "^([ 	]*[#:>\|}])+"
-## Otherwise:
-# set quotestr "> "
+## This is an extended regular expression.  The default is:
+# set quotestr "^([ 	]*[#:>|}])+"
 
 ## Fix Backspace/Delete confusion problem.
 # set rebinddelete