From: David Lawrence Ramsey Date: Wed, 24 May 2006 21:07:10 +0000 (+0000) Subject: per Benno Schulenberg's patch, with a few tweaks by me, add miscellaneous X-Git-Tag: v1.3.12~118 X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=0c9551a4ddb7a16d8c3009f32772d7414ade896c;p=nano.git per Benno Schulenberg's patch, with a few tweaks by me, add miscellaneous minor fixes to nanorc.sample git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3562 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- diff --git a/ChangeLog b/ChangeLog index 78ed58d4..b3efc5da 100644 --- a/ChangeLog +++ b/ChangeLog @@ -366,7 +366,7 @@ CVS code - - doc/man/fr/nano.1, doc/man/fr/nanorc.5, doc/man/fr/rnano.1: - Updated manpage translations by Jean-Philippe Guérard. - doc/nanorc.sample: - - Miscellaneous minor fixes. (DLR) + - Miscellaneous minor fixes. (DLR and Benno Schulenberg) - Tweak the "c-file" regex for characters to accept '"' again, as it's apparently valid, and simplify it. (DLR) - Simplify the "shellscript" regex for command line options. diff --git a/doc/nanorc.sample b/doc/nanorc.sample index f4d1d448..c786cf09 100644 --- a/doc/nanorc.sample +++ b/doc/nanorc.sample @@ -95,7 +95,7 @@ ## Set operating directory. nano will not read or write files outside ## this directory and its subdirectories. Also, the current directory -## is changed to here, so files are inserted from this dir. A blank +## is changed to here, so any files are inserted from this dir. A blank ## string means the operating directory feature is turned off. ## # set operatingdir "" @@ -170,6 +170,7 @@ ## characters as part of a word. # set wordbounds + ## Color setup ## ## Format: @@ -188,9 +189,9 @@ ## "color" will do case sensitive matches, while "icolor" will do case ## insensitive matches. ## -## Legal colors: white, black, red, blue, green, yellow, magenta, cyan. -## You may use the prefix "bright" to mean a stronger color highlight -## for the foreground. +## Valid colors: white, black, red, blue, green, yellow, magenta, cyan. +## For foreground colors, you may use the prefix "bright" to get a +## stronger highlight. ## ## To use multi-line regexes, use the start="regex" end="regex" ## [start="regex" end="regex"...] format. @@ -206,6 +207,9 @@ ## include "syntax file" ## ## All regexes should be extended regular expressions. + + +## Here is an example for C/C++. ## # syntax "c-file" "\.(c|C|cc|cpp|cxx|h|H|hh|hpp|hxx)$" # color brightred "\<[A-Z_][0-9A-Z_]+\>" @@ -218,38 +222,60 @@ # color brightcyan "^[[:space:]]*#[[:space:]]*(define|undef|include|ifn?def|endif|elif|else|if|warning|error)" # color brightmagenta "'([^'\]|(\\["'abfnrtv\\]))'" "'\\(([0-3]?[0-7]{1,2}))'" "'\\x[0-9A-Fa-f]{1,2}'" ## -## GCC builtins. -## +## GCC builtins # color cyan "__attribute__[[:space:]]*\(\([^)]*\)\)" "__(aligned|asm|builtin|hidden|inline|packed|restrict|section|typeof|weak)__" ## ## String highlighting. You will in general want your comments and ## strings to come last, because syntax highlighting rules will be ## applied in the order they are read in. -## # color brightyellow "<[^= ]*>" ""(\\.|[^"])*"" ## ## This string is VERY resource intensive! # color brightyellow start=""(\\.|[^"])*\\[[:space:]]*$" end="^(\\.|[^"])*"" ## -## Comment highlighting. +## Comment highlighting # color brightblue "//.*" # color brightblue start="/\*" end="\*/" ## Here is a short example for HTML. +## # syntax "HTML" "\.html$" # color blue start="<" end=">" # color red "&[^;[[:space:]]]*;" ## Here is a short example for TeX files. +## # syntax "TeX" "\.tex$" # icolor green "\\.|\\[A-Z]*" # color magenta "[{}]" # color blue "%.*" ## Here is an example for quoted emails (under e.g. mutt). +## # syntax "mutt" # color green "^>.*" +## Here is an example for patch files. +## +# syntax "patch" "\.(patch|diff)$" +# color brightgreen "^\+.*" +# color green "^\+\+\+.*" +# color brightblue "^ .*" +# color brightred "^-.*" +# color red "^---.*" +# color brightyellow "^@@.*" +# color magenta "^diff.*" + +## Here is an example for manpages. +## +# syntax "manpage" "\.[1-9]x?$" +# color green "\.(S|T)H.*$" +# color brightgreen "\.(S|T)H" "\.TP" +# color brightred "\.(BR?|I[PR]?).*$" +# color brightblue "\.(BR?|I[PR]?|PP)" +# color brightwhite "\\f[BIPR]" +# color yellow "\.(br|DS|RS|RE|PD)" + ## Here is an example for groff. ## # syntax "groff" "\.m[ems]$" "\.rof" "\.tmac$" "^tmac." @@ -259,7 +285,7 @@ # color brightmagenta "\\." ## Highlight the argument of \f or \s in the same color # color brightmagenta "\\f." "\\f\(.." "\\s(\+|\-)?[0-9]" -## \n +## Newlines # color cyan "(\\|\\\\)n(.|\(..)" # color cyan start="(\\|\\\\)n\[" end="]" ## Requests @@ -309,27 +335,6 @@ # color brightblue start="/\*\*" end="\*/" # color ,green "[[:space:]]+$" -## Here is an example for patch files. -## -# syntax "patch" "\.(patch|diff)$" -# color brightgreen "^\+.*" -# color green "^\+\+\+.*" -# color brightblue "^ .*" -# color brightred "^-.*" -# color red "^---.*" -# color brightyellow "^@@.*" -# color magenta "^diff.*" - -## Here is an example for manpages. -## -# syntax "manpage" "\.[1-9]x?$" -# color green "\.(S|T)H.*$" -# color brightgreen "\.(S|T)H" "\.TP" -# color brightred "\.(BR?|I[PR]?).*$" -# color brightblue "\.(BR?|I[PR]?|PP)" -# color brightwhite "\\f[BIPR]" -# color yellow "\.(br|DS|RS|RE|PD)" - ## Here is an example for assembler. ## # syntax "asm-file" "\.(S|s|asm)$" @@ -362,15 +367,15 @@ ## Here is an example for your .nanorc. ## # syntax "nanorc" "(\.|/|)nanorc$" -## highlight possible errors and parameters +## Possible errors and parameters # icolor brightwhite "^[[:space:]]*((un)?set|include|syntax|i?color).*$" -## set, unset, include, syntax, and color +## Keywords # icolor cyan "^[[:space:]]*(set|unset)[[:space:]]+(autoindent|backup|backupdir|backwards|boldtext|brackets|casesensitive|const|cut|fill|historylog|matchbrackets|morespace|mouse|multibuffer|noconvert|nofollow|nohelp|nonewlines|nowrap|operatingdir|preserve|punct)\>" "^[[:space:]]*(set|unset)[[:space:]]+(quickblank|quotestr|rebinddelete|rebindkeypad|regexp|smarthome|smooth|speller|suspend|tabsize|tabstospaces|tempfile|view|whitespace|wordbounds)\>" # icolor green "^[[:space:]]*(set|unset|include|syntax)\>" -## colors +## Colors # icolor yellow "^[[:space:]]*i?color[[:space:]]*(bright)?(white|black|red|blue|green|yellow|magenta|cyan)?(,(white|black|red|blue|green|yellow|magenta|cyan))?\>" # icolor magenta "^[[:space:]]*i?color\>" "\<(start|end)=" -## strings +## Strings # icolor white ""(\\.|[^"])*"" -## comments +## Comments # icolor blue "^[[:space:]]*#.*$"