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

Removing the mistaken square brackets around the arguments 

of "header" and "magic" -- those regexes are not optional.


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5132 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
Benno Schulenberg 2015-03-07 22:11:56 +00:00
parent 3131d0c48a
commit 5891c4a542
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -3,6 +3,10 @@
inherent imperfection of using regular expressions for syntax inherent imperfection of using regular expressions for syntax
highlighting, as suggested by Mike Frysinger in bug #30962. highlighting, as suggested by Mike Frysinger in bug #30962.
* doc/man/nanorc.5: Improve the indentation of some lists. * doc/man/nanorc.5: Improve the indentation of some lists.
* doc/man/nanorc.5, doc/texinfo/nano.texi: Remove the mistaken
square brackets around the arguments of "header" and "magic" --
those arguments are not optional. Also add "formatter" to the
texinfo document, and slightly improve its punctuation.
GNU nano 2.3.99pre2 - 2015.02.27 GNU nano 2.3.99pre2 - 2015.02.27
2015-02-25 Chris Allegretta <chrisa@asty.org> 2015-02-25 Chris Allegretta <chrisa@asty.org>

8
doc/man/nanorc.5
View File

@ -279,15 +279,15 @@ defined).
.TP .TP
.BI formatter " program " \fR[ "arg " \fR...] .BI formatter " program " \fR[ "arg " \fR...]
For the currently defined syntax, use the given \fIprogram\fR For the currently defined syntax, use the given \fIprogram\fR
to automatically re-format text, useful in certain programming to automatically reformat text. Useful in certain programming
languages (e.g. go) languages (e.g. go).
.TP .TP
.BR header " [""\fIregex\fR"" ...] .BR header " \fIregex\fR " ...
For the currently defined syntax, add one or more regexes which will For the currently defined syntax, add one or more regexes which will
be compared against the very first line of the file to be edited, be compared against the very first line of the file to be edited,
to determine whether this syntax should be used for that file. to determine whether this syntax should be used for that file.
.TP .TP
.BR magic " [""\fIregex\fR"" ...] .BR magic " \fIregex\fR " ...
For the currently defined syntax, add one or more regexes which For the currently defined syntax, add one or more regexes which
will be compared against the result of querying the \fBmagic\fP will be compared against the result of querying the \fBmagic\fP
database about the file to be edited, to determine whether this database about the file to be edited, to determine whether this

6
doc/texinfo/nano.texi
View File

@ -840,12 +840,16 @@ syntax's "fileregex".
For the currently defined syntax, use the given program to invoke the For the currently defined syntax, use the given program to invoke the
linter (this overrides the speller function when defined). linter (this overrides the speller function when defined).
@item formatter program [arg @dots{}]
For the currently defined syntax, use the given program to automatically
reformat text. Useful in certain programming languages (e.g. go).
@item header "regex" @dots{} @item header "regex" @dots{}
For the currently defined syntax, add one or more regexes which will For the currently defined syntax, add one or more regexes which will
be compared against the very first line of the file to be edited, be compared against the very first line of the file to be edited,
to determine whether this syntax should be used for that file. to determine whether this syntax should be used for that file.
@item magic ["regex" @dots{}] @item magic "regex" @dots{}
For the currently defined syntax, add one or more regexes which will be For the currently defined syntax, add one or more regexes which will be
compared against the result of querying the magic database about the file compared against the result of querying the magic database about the file
to be edited, to determine whether this syntax should be used for that to be edited, to determine whether this syntax should be used for that