From 21cc55075280a0712a33bfe5703aaafa2e5f5dab Mon Sep 17 00:00:00 2001 From: David Lawrence Ramsey Date: Sat, 6 Sep 2003 19:04:02 +0000 Subject: [PATCH] minor nanorc.sample fixes git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@1541 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- ChangeLog | 7 ++++++- nanorc.sample | 14 +++++++------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index de214fa9..fad67278 100644 --- a/ChangeLog +++ b/ChangeLog @@ -90,7 +90,12 @@ CVS code - and add "rebinddelete" entry. (DLR) - Update the regexes for nanorc files. (Brand Huntsman, slightly modified by DLR) - - Fix one attempt at a bright background color. (DLR) + - Fix an attempt at a bright background color in the sample Java + source regexes. (DLR) + - Since tabs are shown as groups of spaces, they are interpreted + as such when parsed by color regexes. Accordingly, simplify + regexes that handle both spaces and tabs to just handle + spaces, as the results are the same. (DLR) - AUTHORS - Updated to show 1.2/1.3 maintainers. diff --git a/nanorc.sample b/nanorc.sample index a898388c..8e80bf71 100644 --- a/nanorc.sample +++ b/nanorc.sample @@ -110,16 +110,16 @@ # color red "\<[A-Z_]{2,}\>" # color green "\<(float|char|int|void|static|const|struct)\>" # color brightyellow "\<(if|while|do|else|case|switch)\>" -# color brightcyan "^#( )*(define|include|ifn?def|endif|elif|else|if)" +# color brightcyan "^ *# *(define|include|ifn?def|endif|elif|else|if)" ## ## 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 "<[^= ]*>" ""(\\.|[^\"])*"" +# color brightyellow "<[^= ]*>" ""(\\.|[^\"])*"" ## ## This string is VERY resource intensive!!! -# color brightyellow start=""(\\.|[^\"])*\\( | )*$" end="^(\\.|[^\"])*"" +# color brightyellow start=""(\\.|[^\"])*\\ *$" end="^(\\.|[^\"])*"" ## ## And we want to have some nice comment highlighting too # color brightblue "//.*" @@ -128,7 +128,7 @@ ## Here is a short example for HTML # syntax "HTML" "\.html$" # color blue start="<" end=">" -# color red "&[^; ]*;" +# color red "&[^; ]*;" ## Here is a short example for TeX files # syntax "TeX" "\.tex$" @@ -193,15 +193,15 @@ # color blue "//.*" # color blue start="/\*" end="\*/" # color brightblue start="/\*\*" end="\*/" -# color green,brightgreen "[ ]+$" +# color brightgreen,green " +$" ## Here is an example for your .nanorc ## # syntax "nanorc" "(\.)?nanorc$" # color brightwhite "^ *(set|unset|syntax|color).*$" -# color cyan "^ *(set|unset)([ ]+)(autoindent|backup|const|cut|fill|historylog|multibuffer|noconvert|nofollow|nohelp|nowrap|operatingdir|preserve|quotestr|rebinddelete|regexp|smooth|speller|suspend|tabsize|tempfile|view)" +# color cyan "^ *(set|unset) +(autoindent|backup|const|cut|fill|historylog|multibuffer|noconvert|nofollow|nohelp|nowrap|operatingdir|preserve|quotestr|rebinddelete|regexp|smooth|speller|suspend|tabsize|tempfile|view)" # color green "^ *(set|unset|syntax)\>" -# color yellow "^ *color([ ]+)(bright)?(white|black|red|blue|green|yellow|magenta|cyan)(,(white|black|red|blue|green|yellow|magenta|cyan))?\>" +# color yellow "^ *color +(bright)?(white|black|red|blue|green|yellow|magenta|cyan)(,(white|black|red|blue|green|yellow|magenta|cyan))?\>" # color magenta "^ *color\>" "\<(start|end)=" # color white "\"(\\.|[^\"])*\"" # color blue "^ *#.*$" -- 2.39.5