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

options: rename 'highlightcolor' to the more distinct 'spotlightcolor' 

This way there cannot be any confusion with syntax highlighting,
and it indicates better that a single place will be highlighted.
master
Benno Schulenberg 2021-03-03 09:31:46 +01:00
parent a543f8cd8f
commit ac5e5179fb
5 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
doc/nano.texi
View File

@ -892,11 +892,6 @@ if your terminal can do those.
Draw a vertical stripe at the given column, to help judge the width of the Draw a vertical stripe at the given column, to help judge the width of the
text. (The color of the stripe can be changed with @code{set stripecolor}.) text. (The color of the stripe can be changed with @code{set stripecolor}.)
@item set highlightcolor [bold,][italic,]@var{fgcolor},@var{bgcolor}
Use this color combination for highlighting a search match.
The default value is @t{black,lightyellow}.
@xref{@code{set functioncolor}} for valid color names.
@item set historylog @item set historylog
Save the last hundred search strings and replacement strings and Save the last hundred search strings and replacement strings and
executed commands, so they can be easily reused in later sessions. executed commands, so they can be easily reused in later sessions.
@ -1073,6 +1068,11 @@ the screen's edge, by using also @code{set atblanks}.)
Use the given program to do spell checking and correcting. Use the given program to do spell checking and correcting.
@xref{@option{--speller}} for details. @xref{@option{--speller}} for details.
@item set spotlightcolor [bold,][italic,]@var{fgcolor},@var{bgcolor}
Use this color combination for highlighting a search match.
The default value is @t{black,lightyellow}.
@xref{@code{set functioncolor}} for valid color names.
@item set stateflags @item set stateflags
Use the top-right corner of the screen for showing some state flags: Use the top-right corner of the screen for showing some state flags:
@code{I} when auto-indenting, @code{M} when the mark is on, @code{L} when @code{I} when auto-indenting, @code{M} when the mark is on, @code{L} when

10
doc/nanorc.5
View File

@ -146,11 +146,6 @@ See \fBset titlecolor\fR for more details.
Draw a vertical stripe at the given column, to help judge the width of the Draw a vertical stripe at the given column, to help judge the width of the
text. (The color of the stripe can be changed with \fBset stripecolor\fR.) text. (The color of the stripe can be changed with \fBset stripecolor\fR.)
.TP .TP
.B set highlightcolor \fR[\fBbold,\fR][\fBitalic,\fR]\fIfgcolor\fB,\fIbgcolor\fR
Use this color combination for highlighting a search match.
The default value is \fBblack,lightyellow\fR.
See \fBset titlecolor\fR for valid color names.
.TP
.B set historylog .B set historylog
Save the last hundred search strings and replacement strings and Save the last hundred search strings and replacement strings and
executed commands, so they can be easily reused in later sessions. executed commands, so they can be easily reused in later sessions.
@ -327,6 +322,11 @@ the screen's edge, by using also \fBset atblanks\fR.)
Use the given \fIprogram\fR to do spell checking and correcting, instead of Use the given \fIprogram\fR to do spell checking and correcting, instead of
using the built-in corrector that calls \fBhunspell\fR(1) or \fBspell\fR(1). using the built-in corrector that calls \fBhunspell\fR(1) or \fBspell\fR(1).
.TP .TP
.B set spotlightcolor \fR[\fBbold,\fR][\fBitalic,\fR]\fIfgcolor\fB,\fIbgcolor\fR
Use this color combination for highlighting a search match.
The default value is \fBblack,lightyellow\fR.
See \fBset titlecolor\fR for valid color names.
.TP
.B set stateflags .B set stateflags
Use the top-right corner of the screen for showing some state flags: Use the top-right corner of the screen for showing some state flags:
\fBI\fR when auto-indenting, \fBM\fR when the mark is on, \fBL\fR when \fBI\fR when auto-indenting, \fBM\fR when the mark is on, \fBL\fR when

6
doc/sample.nanorc.in
View File

@ -203,13 +203,13 @@
## Paint the interface elements of nano. These are examples; there are ## Paint the interface elements of nano. These are examples; there are
## no colors by default, except for errorcolor and highlightcolor. ## no colors by default, except for errorcolor and spotlightcolor.
# set titlecolor bold,lightwhite,blue # set titlecolor bold,lightwhite,blue
# set promptcolor lightwhite,lightblack # set promptcolor lightwhite,lightblack
# set statuscolor bold,lightwhite,green # set statuscolor bold,lightwhite,green
# set errorcolor bold,lightwhite,red # set errorcolor bold,lightwhite,red
# set spotlightcolor black,lime
# set selectedcolor lightwhite,magenta # set selectedcolor lightwhite,magenta
# set highlightcolor black,lime
# set stripecolor ,yellow # set stripecolor ,yellow
# set scrollercolor cyan # set scrollercolor cyan
# set numbercolor cyan # set numbercolor cyan
@ -221,8 +221,8 @@
# set promptcolor black,yellow # set promptcolor black,yellow
# set statuscolor bold,lightwhite,magenta # set statuscolor bold,lightwhite,magenta
# set errorcolor bold,lightwhite,red # set errorcolor bold,lightwhite,red
# set spotlightcolor black,orange
# set selectedcolor lightwhite,cyan # set selectedcolor lightwhite,cyan
# set highlightcolor black,orange
# set stripecolor ,yellow # set stripecolor ,yellow
# set scrollercolor magenta # set scrollercolor magenta
# set numbercolor magenta # set numbercolor magenta

4
src/rcfile.c
View File

@ -132,7 +132,7 @@ static const rcoption rcopts[] = {
{"stripecolor", 0}, {"stripecolor", 0},
{"scrollercolor", 0}, {"scrollercolor", 0},
{"selectedcolor", 0}, {"selectedcolor", 0},
{"highlightcolor", 0}, {"spotlightcolor", 0},
{"promptcolor", 0}, {"promptcolor", 0},
{"statuscolor", 0}, {"statuscolor", 0},
{"errorcolor", 0}, {"errorcolor", 0},
@ -1558,7 +1558,7 @@ void parse_rcfile(FILE *rcstream, bool just_syntax, bool intros_only)
color_combo[SCROLL_BAR] = parse_interface_color(argument); color_combo[SCROLL_BAR] = parse_interface_color(argument);
else if (strcmp(option, "selectedcolor") == 0) else if (strcmp(option, "selectedcolor") == 0)
color_combo[SELECTED_TEXT] = parse_interface_color(argument); color_combo[SELECTED_TEXT] = parse_interface_color(argument);
else if (strcmp(option, "highlightcolor") == 0) else if (strcmp(option, "spotlightcolor") == 0)
color_combo[HIGHLIGHTED] = parse_interface_color(argument); color_combo[HIGHLIGHTED] = parse_interface_color(argument);
else if (strcmp(option, "promptcolor") == 0) else if (strcmp(option, "promptcolor") == 0)
color_combo[PROMPT_BAR] = parse_interface_color(argument); color_combo[PROMPT_BAR] = parse_interface_color(argument);

4
syntax/nanorc.nanorc
View File

@ -8,8 +8,8 @@ color brightred ".*"
# Keywords # Keywords
color brightgreen "^[[:space:]]*(set|unset)[[:space:]]+(afterends|allow_insecure_backup|atblanks|autoindent|backup|boldtext|bookstyle|breaklonglines|casesensitive|constantshow|cutfromcursor|emptyline|historylog|indicator|jumpyscrolling|linenumbers|locking|magic|minibar|mouse|multibuffer|noconvert|nohelp|nonewlines|positionlog|preserve|quickblank|rawsequences|rebinddelete|regexp|saveonexit|showcursor|smarthome|softwrap|stateflags|suspendable|tabstospaces|trimblanks|unix|wordbounds|zap)\>" color brightgreen "^[[:space:]]*(set|unset)[[:space:]]+(afterends|allow_insecure_backup|atblanks|autoindent|backup|boldtext|bookstyle|breaklonglines|casesensitive|constantshow|cutfromcursor|emptyline|historylog|indicator|jumpyscrolling|linenumbers|locking|magic|minibar|mouse|multibuffer|noconvert|nohelp|nonewlines|positionlog|preserve|quickblank|rawsequences|rebinddelete|regexp|saveonexit|showcursor|smarthome|softwrap|stateflags|suspendable|tabstospaces|trimblanks|unix|wordbounds|zap)\>"
color yellow "^[[:space:]]*set[[:space:]]+((error|function|highlight|key|number|prompt|scroller|selected|status|stripe|title)color)[[:space:]]+(bold,)?(italic,)?(bright|light)?(white|black|red|blue|green|yellow|magenta|cyan|normal|pink|purple|mauve|lagoon|mint|lime|peach|orange|latte)?(,(light)?(white|black|red|blue|green|yellow|magenta|cyan|normal|pink|purple|mauve|lagoon|mint|lime|peach|orange|latte))?\>" color yellow "^[[:space:]]*set[[:space:]]+((error|function|key|number|prompt|scroller|selected|spotlight|status|stripe|title)color)[[:space:]]+(bold,)?(italic,)?(bright|light)?(white|black|red|blue|green|yellow|magenta|cyan|normal|pink|purple|mauve|lagoon|mint|lime|peach|orange|latte)?(,(light)?(white|black|red|blue|green|yellow|magenta|cyan|normal|pink|purple|mauve|lagoon|mint|lime|peach|orange|latte))?\>"
color brightgreen "^[[:space:]]*set[[:space:]]+(backupdir|brackets|errorcolor|functioncolor|highlightcolor|keycolor|matchbrackets|numbercolor|operatingdir|promptcolor|punct|quotestr|scrollercolor|selectedcolor|speller|statuscolor|stripecolor|titlecolor|whitespace|wordchars)[[:space:]]+" color brightgreen "^[[:space:]]*set[[:space:]]+(backupdir|brackets|errorcolor|functioncolor|keycolor|matchbrackets|numbercolor|operatingdir|promptcolor|punct|quotestr|scrollercolor|selectedcolor|speller|spotlightcolor|statuscolor|stripecolor|titlecolor|whitespace|wordchars)[[:space:]]+"
color brightgreen "^[[:space:]]*set[[:space:]]+(fill[[:space:]]+-?[[:digit:]]+|(guidestripe|tabsize)[[:space:]]+[1-9][0-9]*)\>" color brightgreen "^[[:space:]]*set[[:space:]]+(fill[[:space:]]+-?[[:digit:]]+|(guidestripe|tabsize)[[:space:]]+[1-9][0-9]*)\>"
color brightgreen "^[[:space:]]*bind[[:space:]]+((\^([A-Za-z]|[]/@\^_`]|Space)|([Ss][Hh]-)?[Mm]-[A-Za-z]|[Mm]-([][!"#$%&'()*+,./0-9:;<=>?@\^_`{|}~-]|Space))|F([1-9]|1[0-9]|2[0-4])|Ins|Del)[[:space:]]+([a-z]+|".*")[[:space:]]+(main|help|search|replace(with)?|yesno|gotoline|writeout|insert|browser|whereisfile|gotodir|execute|spell|linter|all)([[:space:]]+#|[[:space:]]*$)" color brightgreen "^[[:space:]]*bind[[:space:]]+((\^([A-Za-z]|[]/@\^_`]|Space)|([Ss][Hh]-)?[Mm]-[A-Za-z]|[Mm]-([][!"#$%&'()*+,./0-9:;<=>?@\^_`{|}~-]|Space))|F([1-9]|1[0-9]|2[0-4])|Ins|Del)[[:space:]]+([a-z]+|".*")[[:space:]]+(main|help|search|replace(with)?|yesno|gotoline|writeout|insert|browser|whereisfile|gotodir|execute|spell|linter|all)([[:space:]]+#|[[:space:]]*$)"
color brightgreen "^[[:space:]]*unbind[[:space:]]+((\^([A-Za-z]|[]/@\^_`]|Space)|([Ss][Hh]-)?[Mm]-[A-Za-z]|[Mm]-([][!"#$%&'()*+,./0-9:;<=>?@\^_`{|}~-]|Space))|F([1-9]|1[0-9]|2[0-4])|Ins|Del)[[:space:]]+(all|main|search|replace(with)?|yesno|gotoline|writeout|insert|ext(ernal)?cmd|help|spell|linter|browser|whereisfile|gotodir)([[:space:]]+#|[[:space:]]*$)" color brightgreen "^[[:space:]]*unbind[[:space:]]+((\^([A-Za-z]|[]/@\^_`]|Space)|([Ss][Hh]-)?[Mm]-[A-Za-z]|[Mm]-([][!"#$%&'()*+,./0-9:;<=>?@\^_`{|}~-]|Space))|F([1-9]|1[0-9]|2[0-4])|Ins|Del)[[:space:]]+(all|main|search|replace(with)?|yesno|gotoline|writeout|insert|ext(ernal)?cmd|help|spell|linter|browser|whereisfile|gotodir)([[:space:]]+#|[[:space:]]*$)"