minor nanorc.sample fixes

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@1541 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

diff --git a/ChangeLog b/ChangeLog
index de214fa94c9d827403ed1d80915f3b165b85b3f6..fad6727885f92ffcb68feb762b13a1547df0972c 100644 (file)
--- 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 a898388c472d746885c48e28e6094d1b9fdb534b..8e80bf71da79623d894f5049041fb419d0195f43 100644 (file)
--- 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 "^ *#.*$"