From 5891c4a54268101f274994b31b7af30ad373312e Mon Sep 17 00:00:00 2001 From: Benno Schulenberg Date: Sat, 7 Mar 2015 22:11:56 +0000 Subject: [PATCH] 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 --- ChangeLog | 4 ++++ doc/man/nanorc.5 | 8 ++++---- doc/texinfo/nano.texi | 6 +++++- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index b09b3cfd..a863744e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,10 @@ inherent imperfection of using regular expressions for syntax highlighting, as suggested by Mike Frysinger in bug #30962. * 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 2015-02-25 Chris Allegretta diff --git a/doc/man/nanorc.5 b/doc/man/nanorc.5 index 7fdb9a28..c9a66c8c 100644 --- a/doc/man/nanorc.5 +++ b/doc/man/nanorc.5 @@ -279,15 +279,15 @@ defined). .TP .BI formatter " program " \fR[ "arg " \fR...] For the currently defined syntax, use the given \fIprogram\fR -to automatically re-format text, useful in certain programming -languages (e.g. go) +to automatically reformat text. Useful in certain programming +languages (e.g. go). .TP -.BR header " [""\fIregex\fR"" ...] +.BR header " \fIregex\fR " ... 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, to determine whether this syntax should be used for that file. .TP -.BR magic " [""\fIregex\fR"" ...] +.BR magic " \fIregex\fR " ... For the currently defined syntax, add one or more regexes which will be compared against the result of querying the \fBmagic\fP database about the file to be edited, to determine whether this diff --git a/doc/texinfo/nano.texi b/doc/texinfo/nano.texi index 9ceaace6..46330fdc 100644 --- a/doc/texinfo/nano.texi +++ b/doc/texinfo/nano.texi @@ -840,12 +840,16 @@ syntax's "fileregex". For the currently defined syntax, use the given program to invoke the 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{} 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, 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 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