Commit 8056390f authored by Benno Schulenberg's avatar Benno Schulenberg
Browse files

Showing quotes where quotes are needed, removing some unneeded spaces,

and doing some other tweaks.


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4836 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
parent 693e2aaf
Showing with 28 additions and 25 deletions
+28 -25
...@@ -4,6 +4,8 @@ ...@@ -4,6 +4,8 @@
and remove an unneeded call of wattroff(). and remove an unneeded call of wattroff().
* doc/man/nanorc.5, doc/texinfo/nano.tex: Document the settings * doc/man/nanorc.5, doc/texinfo/nano.tex: Document the settings
of titlecolor, statuscolor, keycolor and functioncolor. of titlecolor, statuscolor, keycolor and functioncolor.
* doc/man/nanorc.5, doc/texinfo/nano.tex: Show quotes where quotes
are needed, remove some unneeded spaces, and do other tweaks.
2014-05-03 Benno Schulenberg <bensberg@justemail.net> 2014-05-03 Benno Schulenberg <bensberg@justemail.net>
* src/*.h, src/*.c: Add the ability to colour four elements of * src/*.h, src/*.c: Add the ability to colour four elements of
......
...@@ -250,31 +250,32 @@ spaces. They must be single-column characters. ...@@ -250,31 +250,32 @@ spaces. They must be single-column characters.
Detect word boundaries more accurately by treating punctuation Detect word boundaries more accurately by treating punctuation
characters as parts of words. characters as parts of words.
.TP .TP
.B syntax "\fIstr\fP" ["\fIfileregex\fP" ... ] .BR syntax " ""\fIstr\fR"" [""\fIfileregex\fR"" ...]"
Defines a syntax named \fIstr\fP which can be activated via the Defines a syntax named \fIstr\fP which can be activated via the
\-Y/\-\-syntax command line option, or will be automatically activated if .BR \-Y / \-\-syntax
command-line option, or will be automatically activated if
the current filename matches the extended regular expression the current filename matches the extended regular expression
\fIfileregex\fP. All following \fBcolor\fP and \fBicolor\fP statements \fIfileregex\fP. All following \fBcolor\fP and \fBicolor\fP statements
will apply to \fIsyntax\fP until a new syntax is defined. will apply to this \fIstr\fP syntax until a new syntax is defined.
The \fInone\fP syntax is reserved; specifying it on the command line is The \fBnone\fP syntax is reserved; specifying it on the command line is
the same as not having a syntax at all. The \fIdefault\fP syntax is the same as not having a syntax at all. The \fBdefault\fP syntax is
special: it takes no \fIfileregex\fP, and applies to files that don't special: it takes no \fIfileregex\fP, and applies to files that don't
match any other syntax's \fIfileregex\fP. match any other syntax's \fIfileregex\fP.
.TP .TP
.B linter \fIprogram\fP [\fIarg\fP ... ] .BI linter " 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 invoke the linter (this overrides the speller function when to invoke the linter (this overrides the speller function when
defined). defined).
.TP .TP
.B magic ["\fIregex\fP" ... ] .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 \fBmagic\fP database when attempting will be compared against the \fBmagic\fP database when attempting
to determine which highlighting rules to use for a given file. This to determine which highlighting rules to use for a given file. This
functionality only works when \fBlibmagic\fP is installed on the functionality only works when \fBlibmagic\fP is installed on the
system and will be silently ignored otherwise. system and will be silently ignored otherwise.
.TP .TP
.B color \fIfgcolor\fP,\fIbgcolor\fP "\fIregex\fP" ... .B color \fIfgcolor\fR,\fIbgcolor\fR """\fIregex\fR""" ...
For the currently defined syntax, display all expressions matching For the currently defined syntax, display all expressions matching
the extended regular expression \fIregex\fP with foreground color the extended regular expression \fIregex\fP with foreground color
\fIfgcolor\fP and background color \fIbgcolor\fP, at least one of which \fIfgcolor\fP and background color \fIbgcolor\fP, at least one of which
...@@ -285,10 +286,10 @@ foreground. If your terminal supports transparency, not specifying a ...@@ -285,10 +286,10 @@ foreground. If your terminal supports transparency, not specifying a
\fIbgcolor\fP tells \fBnano\fP to attempt to use a transparent \fIbgcolor\fP tells \fBnano\fP to attempt to use a transparent
background. background.
.TP .TP
.B icolor \fIfgcolor\fP,\fIbgcolor\fP "\fIregex\fP" ... .B icolor \fIfgcolor\fR,\fIbgcolor\fR """\fIregex\fR""" ...
Same as above, except that the expression matching is case insensitive. Same as above, except that the expression matching is case insensitive.
.TP .TP
.B color \fIfgcolor\fP,\fIbgcolor\fP start="\fIsr\fP" end="\fIer\fP" .BR color " \fIfgcolor\fR,\fIbgcolor\fR " start= """\fIsr\fR"" " end= """\fIer\fR""
Display expressions which start with the extended regular expression Display expressions which start with the extended regular expression
\fIsr\fP and end with the extended regular expression \fIer\fP with \fIsr\fP and end with the extended regular expression \fIer\fP with
foreground color \fIfgcolor\fP and background color \fIbgcolor\fP, foreground color \fIfgcolor\fP and background color \fIbgcolor\fP,
...@@ -297,15 +298,15 @@ highlighting to span multiple lines. Note that all subsequent instances ...@@ -297,15 +298,15 @@ highlighting to span multiple lines. Note that all subsequent instances
of \fIsr\fP after an initial \fIsr\fP is found will be highlighted until of \fIsr\fP after an initial \fIsr\fP is found will be highlighted until
the first instance of \fIer\fP. the first instance of \fIer\fP.
.TP .TP
.B icolor \fIfgcolor\fP,\fIbgcolor\fP start="\fIsr\fP" end="\fIer\fP" .BR icolor " \fIfgcolor\fR,\fIbgcolor\fR " start= """\fIsr\fR"" " end= """\fIer\fR""
Same as above, except that the expression matching is case insensitive. Same as above, except that the expression matching is case insensitive.
.TP .TP
.B include "\fIsyntaxfile\fP" .BR include " ""\fIsyntaxfile\fR"""
Read in self-contained color syntaxes from \fIsyntaxfile\fP. Note that Read in self-contained color syntaxes from \fIsyntaxfile\fP. Note that
\fIsyntaxfile\fP can only contain \fBsyntax\fP, \fBcolor\fP, and \fIsyntaxfile\fP can only contain \fBsyntax\fP, \fBcolor\fP, and
\fBicolor\fP commands. \fBicolor\fP commands.
.TP .TP
.B extendsyntax \fIstr\fP \fIdirective\fP [ \fIarg\fP ... ] .BI extendsyntax " str directive " \fR[ "arg " \fR...]
Extend the syntax previously defined as \fIstr\fP to include Extend the syntax previously defined as \fIstr\fP to include
new information. Allows you to add a new \fIcolor\fP, \fIicolor\fP, new information. Allows you to add a new \fIcolor\fP, \fIicolor\fP,
\fImagic\fP, \fIheader\fP, or \fIlinter\fP directive to a syntax \fImagic\fP, \fIheader\fP, or \fIlinter\fP directive to a syntax
...@@ -315,11 +316,11 @@ system-installed syntax definitions (which are normally not writable). ...@@ -315,11 +316,11 @@ system-installed syntax definitions (which are normally not writable).
.SH KEY BINDINGS .SH KEY BINDINGS
Key bindings may be reassigned via the following commands: Key bindings may be reassigned via the following commands:
.TP .TP
.B bind \fIkey\fP \fIfunction\fP \fImenu\fP .BI bind " key function menu"
Rebinds the key \fIkey\fP to a new function named \fIfunction\fP in the Rebinds the key \fIkey\fP to a new function named \fIfunction\fP in the
context of menu \fImenu\fP. context of menu \fImenu\fP.
.TP .TP
.B unbind \fIkey\fP \fImenu\fP .BI unbind " key menu"
Unbinds the key \fIkey\fP from the menu named \fImenu\fP (or from all Unbinds the key \fIkey\fP from the menu named \fImenu\fP (or from all
menus where it exists by using \fBall\fP). menus where it exists by using \fBall\fP).
......
...@@ -562,7 +562,7 @@ length will be the screen width less "n" columns. The default value is ...@@ -562,7 +562,7 @@ length will be the screen width less "n" columns. The default value is
-8. -8.
@item set functioncolor fgcolor,bgcolor @item set functioncolor fgcolor,bgcolor
Specify the color (combination) to use for the function descriptions Specify the color combination to use for the function descriptions
in the two help lines at the bottom of the screen. in the two help lines at the bottom of the screen.
See "set titlecolor" for more details. See "set titlecolor" for more details.
...@@ -570,7 +570,7 @@ See "set titlecolor" for more details. ...@@ -570,7 +570,7 @@ See "set titlecolor" for more details.
Enable ~/.nano_history for saving and reading search/replace strings. Enable ~/.nano_history for saving and reading search/replace strings.
@item set keycolor fgcolor,bgcolor @item set keycolor fgcolor,bgcolor
Specify the color (combination) to use for the shortcut key combos Specify the color combination to use for the shortcut key combos
in the two help lines at the bottom of the screen. in the two help lines at the bottom of the screen.
See "set titlecolor" for more details. See "set titlecolor" for more details.
...@@ -682,7 +682,7 @@ Use spelling checker "spellprog" instead of the built-in one, which ...@@ -682,7 +682,7 @@ Use spelling checker "spellprog" instead of the built-in one, which
calls "spell". calls "spell".
@item set statuscolor fgcolor,bgcolor @item set statuscolor fgcolor,bgcolor
Specify the color (combination) to use for the statusbar. Specify the color combination to use for the statusbar.
See "set titlecolor" for more details. See "set titlecolor" for more details.
@item set/unset suspend @item set/unset suspend
...@@ -699,7 +699,7 @@ Convert typed tabs to spaces. ...@@ -699,7 +699,7 @@ Convert typed tabs to spaces.
Save automatically on exit, don't prompt. Save automatically on exit, don't prompt.
@item set titlecolor fgcolor,bgcolor @item set titlecolor fgcolor,bgcolor
Specify the color (combination) to use for the titlebar. Specify the color combination to use for the titlebar.
Valid color names for foreground and background are: Valid color names for foreground and background are:
white, black, red, blue, green, yellow, magenta, and cyan. white, black, red, blue, green, yellow, magenta, and cyan.
And either "fgcolor" or ",bgcolor" may be left out. And either "fgcolor" or ",bgcolor" may be left out.
...@@ -718,23 +718,23 @@ spaces. They must be single-column characters. ...@@ -718,23 +718,23 @@ spaces. They must be single-column characters.
Detect word boundaries more accurately by treating punctuation Detect word boundaries more accurately by treating punctuation
characters as part of a word. characters as part of a word.
@item syntax "str" ["fileregex" @dots{} ] @item syntax "str" ["fileregex" @dots{}]
Defines a syntax named "str" which can be activated via the -Y/--syntax Defines a syntax named "str" which can be activated via the -Y/--syntax
command line option, or will be automatically activated if the current command line option, or will be automatically activated if the current
filename matches the extended regular expression "fileregex". All filename matches the extended regular expression "fileregex". All
following "color" and "icolor" statements will apply to "syntax" until a following "color" and "icolor" statements will apply to this "str"
new syntax is defined. syntax until a new syntax is defined.
The "none" syntax is reserved; specifying it on the command line is the The "none" syntax is reserved; specifying it on the command line is the
same as not having a syntax at all. The "default" syntax is special: it same as not having a syntax at all. The "default" syntax is special: it
takes no "fileregex", and applies to files that don't match any other takes no "fileregex", and applies to files that don't match any other
syntax's "fileregex". syntax's "fileregex".
@item linter program [arg @dots{} ] @item linter program [arg @dots{}]
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 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 magic database when attempting to determine which compared against the magic database when attempting to determine which
highlighting rules to use for a given file. This functionality only works highlighting rules to use for a given file. This functionality only works
...@@ -768,7 +768,7 @@ Same as above, except that the expression matching is case insensitive. ...@@ -768,7 +768,7 @@ Same as above, except that the expression matching is case insensitive.
Read in self-contained color syntaxes from "syntaxfile". Note that Read in self-contained color syntaxes from "syntaxfile". Note that
"syntaxfile" can only contain "syntax", "color", and "icolor" commands. "syntaxfile" can only contain "syntax", "color", and "icolor" commands.
@item extendsyntax str directive [arg @dots{} ] @item extendsyntax str directive [arg @dots{}]
Extend the syntax previously defined as str to include new information. Extend the syntax previously defined as str to include new information.
Allows you to add a new color, icolor, magic, header, or linter directive Allows you to add a new color, icolor, magic, header, or linter directive
to an already defined syntax. Useful when you want to add to definitions to an already defined syntax. Useful when you want to add to definitions
......
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