Merge pull request #9 from maxnordlund/master

Fixed broken RegEXPs'

33 files changed, 84 insertions, 84 deletions

diff --git a/aptsrclist.nanorc b/aptsrclist.nanorc
index f1a2b4f..82ea805 100644
--- a/aptsrclist.nanorc
+++ b/aptsrclist.nanorc
@@ -1,17 +1,17 @@
 ## syntax highlighting for /etc/apt/sources.list
- 
+
 syntax "apt/sources.list" "sources\.list(\.old|~)?$"
 # component
-color brightmagenta "^deb(-src)? ((http|file|ftp):/[^ ]+|cdrom:\[[^\]]+\]/|cdrom:\[[a-zA-Z0-9\._-\(\) ]+\]/) [^ ]+ .+$"
+color brightmagenta "^deb(-src)? ((http|file|ftp):/[^ ]+|cdrom:\[[^\]]+\]/|cdrom:\[[a-zA-Z0-9\._\-\(\) ]+\]/) [^ ]+ .+$"
 # distribution
-color brightred "^deb(-src)? ((http|file|ftp):/[^ ]+|cdrom:\[[^\]]+\]/|cdrom:\[[a-zA-Z0-9\._-\(\) ]+\]/) [^ ]+"
+color brightred "^deb(-src)? ((http|file|ftp):/[^ ]+|cdrom:\[[^\]]+\]/|cdrom:\[[a-zA-Z0-9\._\-\(\) ]+\]/) [^ ]+"
 # URI
 color brightgreen "(http|file|ftp):/[^ ]+"
 # cdroms
 # [^\]] does not workÉ
-color brightgreen "cdrom:\[[a-zA-Z0-9\._-\(\) ]+\]/"
+color brightgreen "cdrom:\[[a-zA-Z0-9\._\-\(\) ]+\]/"
 # deb / deb-src
 color cyan "^deb"
 color brightblue "^deb-src"
 # comments
-color brightyellow "#.*"
\ No newline at end of file
+color brightyellow "#.*"
diff --git a/changelogs.nanorc b/changelogs.nanorc
index 74158c2..791e9cd 100644
--- a/changelogs.nanorc
+++ b/changelogs.nanorc
@@ -8,7 +8,7 @@ color brightwhite "[0-9]"
 color brightblue "[0-9][0-9]\:[0-9][0-9]\:[0-9][0-9]"
 color blue "[0-9][0-9][0-9][0-9]\-[0-9][0-9]\-[0-9][0-9]"
 color blue "[0-9][0-9][0-9][0-9]\/[0-9][0-9]\/[0-9][0-9]"
-color blue "\<(CEST|CET|CST||CDT|EDT)\>"
+color blue "\<(CEST|CET|CST|CDT|EDT)\>"
 color yellow "[0-9]\..*$"
 color cyan "\*.*$"
 color brightblue "\<(pre.*$|beta.*$|rc.*$|release.*$)\>"
diff --git a/config.nanorc b/config.nanorc
index 7e394ee..9fd227f 100644
--- a/config.nanorc
+++ b/config.nanorc
@@ -1,5 +1,5 @@
 ### several config files
-syntax "config" "(\.|/|)config$" "(\.|/|)logout$" "(\.|/|)COLORS$" "(\.|/|)colors$"
+syntax "config" "(\.|/)config$" "(\.|/)logout$" "(\.|/)COLORS$" "(\.|/)colors$"
 color red "/.*$" "TERM" "\..*$" "=.*$" "\*.*$"
 color white ":unscaled" "[0-9]"
 color blue "setenv|export" "\;"
diff --git a/config2.nanorc b/config2.nanorc
index 54f686d..5ea3b80 100644
--- a/config2.nanorc
+++ b/config2.nanorc
@@ -1,9 +1,9 @@
 ### more config files
-syntax "config2" "(\.|/|)env$" "(\.|/|)server.$" "hosts" "gpm" "local.*$" "bootsplash" "crypto-loop"
+syntax "config2" "(\.|/)env$" "(\.|/)server.$" "hosts" "gpm" "local.*$" "bootsplash" "crypto-loop"
 color red "/.*$" "http\:\/\/.*$"
 color white ":unscaled"
 color blue "setenv|export"
 color brightwhite "[0-9]"
 color green "#.*$"
-color white "http\:\/\/" "ftp\:\/\/" "rsync\:\/\/" 
+color white "http\:\/\/" "ftp\:\/\/" "rsync\:\/\/"
 
diff --git a/configfiles.nanorc b/configfiles.nanorc
index 10140cc..e9e90cb 100644
--- a/configfiles.nanorc
+++ b/configfiles.nanorc
@@ -1,5 +1,5 @@
 ### all *conf files  (e.g. make.conf, xorg.conf, grub.conf, make.globals, Xfce files...)
-syntax "configfiles" "(\.|/|)conf$" "(\.|/|)ample$" "(\.|/|)globals$" "xfce.*$" "syslog-ng" "sudoers"
+syntax "configfiles" "(\.|/)conf$" "(\.|/)ample$" "(\.|/)globals$" "xfce.*$" "syslog-ng" "sudoers"
 color brightwhite "\<(alias)\>"
 color blue "<(\\.|[^'])*>"
 color magenta "[a-zA-Z0-9\_]+="
diff --git a/cython.nanorc b/cython.nanorc
index 66083ea..ab71a82 100644
--- a/cython.nanorc
+++ b/cython.nanorc
@@ -2,8 +2,8 @@
 ##
 syntax "cython" "\.pyx$" "\.pxd$" "\.pyi$"
 icolor brightred "def [ 0-9A-Z_]+"
-icolor brightred "cpdef [ 0-9A-Z_]+\(.*?\):"
-icolor brightred "cdef cppclass [ 0-9A-Z_]+\(.*?\):"
+icolor brightred "cpdef [ 0-9A-Z_]+\(.\*?\):"
+icolor brightred "cdef cppclass [ 0-9A-Z_]+\(.\*?\):"
 
 
 
diff --git a/desc.nanorc b/desc.nanorc
index ea94078..ac3a341 100644
--- a/desc.nanorc
+++ b/desc.nanorc
@@ -1,5 +1,5 @@
 ### all *desc files ( e.g. use.desc, use.local.desc )
-syntax "use" "(\.|/|)desc$"
+syntax "use" "(\.|/)desc$"
 color green ".*\-"
 color white "\:.*$"
 color white "\-.*$"
@@ -8,4 +8,4 @@ color blue "\-(\\.|[^'])*\:"
 color yellow "\/(\\.|[^'])*\:"
 color red "x86" "http\:\/\/.*$"
 color brightred "\!\!(\\.|[^'])*\!\!" "DO NOT SET THIS FLAG YOURSELF!"
-color green "#.*$" 
+color green "#.*$"
diff --git a/dummy.nanorc b/dummy.nanorc
index be4aff5..a69e53c 100644
--- a/dummy.nanorc
+++ b/dummy.nanorc
@@ -7,7 +7,7 @@
 #
 # If you want to create your own rules you can use this simple example:
 #
-# syntax "Dummy" "(\.|/|)foo$"  -> this creates the ruleset "Dummy" and it
+# syntax "Dummy" "(\.|/)foo$"  -> this creates the ruleset "Dummy" and it
 #               matches all filenames ending with foo
 #      "foo"         -> this matches foo exactly
 #      "foo.*$"   -> this matches files beginning with foo
@@ -37,4 +37,4 @@
 #                                  even if there are more lines between
 #
 #
-########################################################################### 
+###########################################################################
diff --git a/ekghistory.nanorc b/ekghistory.nanorc
index 09350b2..70e34b2 100644
--- a/ekghistory.nanorc
+++ b/ekghistory.nanorc
@@ -1,4 +1,4 @@
-syntax "ekghistory" "(\.|/|).gg/history"
+syntax "ekghistory" "(\.|/).gg/history"
 icolor cyan start="<" end=">"
 icolor green ",(\\.|[^\"])*,"
 color yellow "chatrecv"
diff --git a/etc-stuff.nanorc b/etc-stuff.nanorc
index 1b80df5..e3980e8 100644
--- a/etc-stuff.nanorc
+++ b/etc-stuff.nanorc
@@ -1,6 +1,6 @@
 ## /etc/ stuff syntax
 ##
-#syntax "etcconf.d" "conf.d/(\.|/|)"
+#syntax "etcconf.d" "conf.d/(\.|/)"
 #color magenta "\".*$"
 #color blue "#.*$"
 
@@ -9,7 +9,7 @@ color green "[0-9]\:.*$"
 color brightwhite "[0-9]"
 icolor brightred "^[[:space:]]*[.0-9A-Z_]*:"
 
-syntax "modules" "modules.conf$" "modules.d/(\.|/|)"
+syntax "modules" "modules.conf$" "modules.d/(\.|/)"
 color brightwhite "[0-9]"
 color red "alias"
 color brightred "(probeall|options)"
@@ -162,7 +162,7 @@ color yellow "(weekly|daily|rotate|postrotate|sharedscripts)"
 color magenta "logrotate"
 color green "#.*$"
 
-syntax "ppppears" "/etc/ppp/peers/(\.|/|)"
+syntax "ppppears" "/etc/ppp/peers/(\.|/)"
 color brightwhite "user.*$"
 color brightyellow "user"
 color brightyellow start="\"" end="\""
@@ -198,7 +198,7 @@ icolor cyan "^[[:space:]]*[.0-9A-Z_]*:"
 color magenta "\:"
 color green "#.*$"
 
-syntax "sane" "sane.d/(\.|/|)"
+syntax "sane" "sane.d/(\.|/)"
 color brightgreen "(scsi|usb|parport|auto)"
 color brightred "option"
 color yellow "(override|vendor|model)"
@@ -220,7 +220,7 @@ color brightblack "(GOTO|IMPORT|ATTRS|SUBSYSTEMS|DVB|IR|BUS|SYSFS|ATTR|LABEL)"
 color yellow "(add|net|scsi|drivers|module|address|bus|devices|ioerr_cnt|ignore_device|svga|video|tt(y(S|USB)|y|s)|last_rule)"
 color yellow "(pnp|(au|ra)dio|tape|disk|snd|microcode|f(b|d|loppy|irmware)|usb|lp|kbd|parport|block|ide|misc|netlink|input)"
 color yellow "(mouse|event|joystick|psmouse|atkbd|spkr|pcspkr|ir|dvb|persistent|storage|end|scanner|sound|dialout|console)"
-color yellow "(cdrom|cdrw|dvd|dvdrw|isdn|pty|vcs|vcsa|ippp|dcbri|ircomm|capi|card|nvidia|rtc|agpgart|psaux|ptmx|sd|dasd|)"
+color yellow "(cdrom|cdrw|dvd|dvdrw|isdn|pty|vcs|vcsa|ippp|dcbri|ircomm|capi|card|nvidia|rtc|agpgart|psaux|ptmx|sd|dasd)"
 color yellow "(ataraid|cciss|ida|rd|3dfx|control|hw|pcm|midi|timer|seq|cpu|msr|dm|i2c|mice|js|ts|loop|md|uinput|inotify|aoe)"
 color brightyellow "(ID_(SERIAL|PATH|CLASS|EDD|CDROM|CDROM_(DVD|DVD_R|CD_RW))|program|parent|removable|GENERATED|COMMENT)"
 color brightyellow "(id(Vendor|Product)|PHYSDEVBUS|(UDEV|UDEVD)_EVENT|INTERFACE_NEW|MODALIAS|modalias|alias|name)"
@@ -273,7 +273,7 @@ color brightyellow "(\{|\})"
 color cyan "/.*$"
 color green "#.*$"
 
-syntax "xinetd.d" "xinetd.d/(\.|/|)"
+syntax "xinetd.d" "xinetd.d/(\.|/)"
 icolor yellow "^[[:space:]]*[.0-9A-Z_]*[[:space:]]"
 color brightgreen "([0-9]|yes)"
 color brightred "(off|[[:space:]]no)"
@@ -345,7 +345,7 @@ color brightgreen "yes"
 color green "#.*$"
 
 syntax "mysql" "my.cnf"
-icolor yellow "^[[:space:]]*[0-9\/a-z_-]*"
+icolor yellow "^[[:space:]]*[0-9\/a-z_\-]*"
 color cyan start="\[" end="\]"
 color green "#.*$"
 
diff --git a/etcxml.nanorc b/etcxml.nanorc
index 240e01a..63b09b9 100644
--- a/etcxml.nanorc
+++ b/etcxml.nanorc
@@ -9,7 +9,7 @@
 #
 ##############################################################################
 
-syntax "etcxml" "/etc/fonts/(\.|/|)" "/etc/xdg/(\.|/|)"
+syntax "etcxml" "/etc/fonts/(\.|/)" "/etc/xdg/(\.|/)"
 color white "^.+$"
 color green  start="<" end=">"
 color cyan   "<[^> ]+"
diff --git a/gentoo.nanorc b/gentoo.nanorc
index b0d2c98..f2a80d9 100644
--- a/gentoo.nanorc
+++ b/gentoo.nanorc
@@ -5,7 +5,7 @@ syntax "ebuild" "\.e(build|class)$"
 color brightgreen "^src_(unpack|compile|install|test)" "^pkg_(config|nofetch|setup|(pre|post)(inst|rm))"
 ## Highlight bash related syntax
 color green "\<(case|do|done|elif|else|esac|exit|fi|for|function|if|in|local|read|return|select|shift|then|time|until|while|continue|break)\>"
-color green "(\{|\}|\(|\)|\;|\]|\[|`|\\|\$|<|>|!|=|&|\|)"
+color green "(\{|\}|\(\)|\;|\]|\[|`|\\|\$|<|>|!|=|&)"
 color green "-(e|d|f|r|g|u|w|x|L)\>"
 color green "-(eq|ne|gt|lt|ge|le|s|n|z)\>"
 ## Highlight variables ... official portage ones in red, all others in bright red
@@ -16,10 +16,10 @@ color red "\<(S|D|T|PV|PF|P|PN|A)\>" "\<C(XX)?FLAGS\>" "\<LDFLAGS\>" "\<C(HOST|T
 color magenta "\<use(_(with|enable))?\> [!a-zA-Z0-9_+ -]*" "inherit.*"
 color brightblue "\<e(begin|end|conf|install|make|warn|infon?|error|log|patch|new(group|user))\>"
 color brightblue "\<die\>" "\<use(_(with|enable))?\>" "\<inherit\>" "\<has\>" "\<(has|best)_version\>" "\<unpack\>"
-color brightblue "\<(do|new)(ins|s?bin|doc|lib(|\.so|\.a)|man|info|exe|initd|confd|envd|pam|menu|icon)\>"
+color brightblue "\<(do|new)(ins|s?bin|doc|lib(\.so|\.a)|man|info|exe|initd|confd|envd|pam|menu|icon)\>"
 color brightblue "\<do(python|sed|dir|hard|sym|html|jar|mo)\>" "\<keepdir\>"
-color brightblue "prepall(|docs|info|man|strip)" "prep(info|lib|lib\.(so|a)|man|strip)"
-color brightblue "\<(|doc|ins|exe)into\>" "\<f(owners|perms)\>" "\<(exe|ins|dir)opts\>"
+color brightblue "prepall(docs|info|man|strip)" "prep(info|lib|lib\.(so|a)|man|strip)"
+color brightblue "\<(doc|ins|exe)into\>" "\<f(owners|perms)\>" "\<(exe|ins|dir)opts\>"
 ## Highlight common commands used in ebuilds
 color blue "\<make\>" "\<(cat|cd|chmod|chown|cp|echo|env|export|grep|let|ln|mkdir|mv|rm|sed|set|tar|touch|unset)\>"
 ## Highlight comments (doesnt work that well)
@@ -35,8 +35,8 @@ syntax "/etc/portage" "\.(keywords|mask|unmask|use)$"
 ## Base text:
 color green "^.+$"
 ## Use flags:
-color brightred "[[:space:]]+\+?[a-zA-Z0-9_-]+"
-color brightblue "[[:space:]]+-[a-zA-Z0-9_-]+"
+color brightred "[[:space:]]+\+?[a-zA-Z0-9_\-]+"
+color brightblue "[[:space:]]+-[a-zA-Z0-9_\-]+"
 ## Likely version numbers:
 color magenta "-[[:digit:]].*([[:space:]]|$)"
 ## Accepted arches:
diff --git a/haskell.nanorc b/haskell.nanorc
index 62ee50d..d2b3f0d 100644
--- a/haskell.nanorc
+++ b/haskell.nanorc
@@ -6,7 +6,7 @@ color red "[ ](as|case|of|class|data|default|deriving|do|forall|foreign|hiding|i
 color red "(^data|^foreign|^import|^infix|^infixl|^infixr|^instance|^module|^newtype|^type)[ ]"
 color red "[ ](as$|case$|of$|class$|data$|default$|deriving$|do$|forall$|foreign$|hiding$|if$|then$|else$|import$|infix$|infixl$|infixr$|instance$|let$|in$|mdo$|module$|newtype$|qualified$|type$|where$)"
 ## lang symbols
-color cyan "(\||@|!|:|_|~|=|\\|;|\(|\)|,|\[|\]|\{|\})"
+color cyan "(\||@|!|:|_|~|=|\\|;|\(\)|,|\[|\]|\{|\})"
 ## lang operators
 color magenta "(==|/=|&&|\|\||<|>|<=|>=)"
 ## lang symbols
diff --git a/initng.nanorc b/initng.nanorc
index ecc7f43..7027952 100644
--- a/initng.nanorc
+++ b/initng.nanorc
@@ -7,7 +7,7 @@ color brightwhite "virtual/.*$"
 color brightblack "daemon/.*$"
 color yellow "(need|use|respawn|exec\ daemon|also_stop)"
 color green "\<(case|do|done|elif|else|esac|exit|fi|for|function|if|in|local|read|return|select|shift|then|time|until|while)\>"
-color green "(\{|\}|\(|\)|\;|\]|\[|`|\\|\$|<|>|!|=|&|\|)"
+color green "(\{|\}|\(\)|\;|\]|\[|`|\\|\$|<|>|!|=|&)"
 color green "-[Ldefgruwx]\>"
 color green "-(eq|ne|gt|lt|ge|le|s|n|z)\>"
 color brightblue "\<(cat|cd|chmod|chown|cp|echo|env|export|grep|install|let|ln|make|mkdir|mv|rm|sed|set|tar|touch|umask|unset)\>"
diff --git a/initscript.nanorc b/initscript.nanorc
index 9fc55f5..0461ef6 100644
--- a/initscript.nanorc
+++ b/initscript.nanorc
@@ -1,11 +1,11 @@
 ## initscripts syntax (stolen from gentoo.nanorc) ;)
 ##
-syntax "initscript" "/etc/init.d/(\.|/|)"
+syntax "initscript" "/etc/init.d/(\.|/)"
 ## All the standard portage functions
 #color brightgreen "^src_(unpack|compile|install|test)" "^pkg_(config|nofetch|setup|(pre|post)(inst|rm))"
 ## Highlight bash related syntax
 color green "\<(case|do|done|elif|else|esac|exit|fi|for|function|if|in|local|read|return|select|shift|then|time|until|while)\>"
-color green "(\{|\}|\(|\)|\;|\]|\[|`|\\|\$|<|>|!|=|&|\|)"
+color green "(\{|\}|\(\)|\;|\]|\[|`|\\|\$|<|>|!|=|&)"
 color green "-(e|d|f|r|g|u|w|x|L)\>"
 color green "-(eq|ne|gt|lt|ge|le|s|n|z)\>"
 ## Highlight variables ... official portage ones in red, all others in bright red
@@ -16,10 +16,10 @@ color red "\<(S|D|T|PV|PF|P|PN|A)\>" "\<C(XX)?FLAGS\>" "\<LDFLAGS\>" "\<C(HOST|T
 color magenta "\<use(_(with|enable))?\> [!a-zA-Z0-9_+ -]*" "inherit.*"
 color brightblue "\<e(begin|end|conf|install|make|warn|infon?|error|patch)\>"
 color brightblue "\<die\>" "\<use(_(with|enable))?\>" "\<inherit\>" "\<has\>" "\<(has|best)_version\>" "\<unpack\>"
-color brightblue "\<(do|new)(ins|s?bin|doc|lib(|\.so|\.a)|man|info|exe|initd|confd|envd|pam|menu|icon)\>"
+color brightblue "\<(do|new)(ins|s?bin|doc|lib(\.so|\.a)|man|info|exe|initd|confd|envd|pam|menu|icon)\>"
 color brightblue "\<do(python|sed|dir|hard|sym|html|jar|mo)\>" "\<keepdir\>"
-color brightblue "prepall(|docs|info|man|strip)" "prep(info|lib|lib\.(so|a)|man|strip)"
-color brightblue "\<(|doc|ins|exe)into\>" "\<f(owners|perms)\>" "\<(exe|ins|dir)opts\>"
+color brightblue "prepall(docs|info|man|strip)" "prep(info|lib|lib\.(so|a)|man|strip)"
+color brightblue "\<(doc|ins|exe)into\>" "\<f(owners|perms)\>" "\<(exe|ins|dir)opts\>"
 ## Highlight common commands used in ebuilds
 color blue "\<make\>" "\<(cat|cd|chmod|chown|cp|echo|env|export|grep|let|ln|mkdir|mv|rm|sed|set|tar|touch|unset)\>"
 ## Highlight comments (doesnt work that well)
diff --git a/js.nanorc b/js.nanorc
index ed2b8f2..bf84ef5 100644
--- a/js.nanorc
+++ b/js.nanorc
@@ -2,7 +2,7 @@
 
 ## Old version
 
-#syntax "jsfiles" "(\.|/|)js$"
+#syntax "jsfiles" "(\.|/)js$"
 #color green "//.*$" start="\/\*" end="\*\/"
 #color blue "'(\\.|[^'])*'"
 #color red ""(\\.|[^\"])*""
diff --git a/lua.nanorc b/lua.nanorc
index e41c8d4..0cf0bc7 100644
--- a/lua.nanorc
+++ b/lua.nanorc
@@ -50,7 +50,7 @@ color brightgreen "(\<(dofile|require|include)|%q|%!|%Q|%r|%x)\>"
 color red "\<([0-9]+)\>"
 
 # Symbols
-color brightmagenta "(\(|\)|\[|\]|\{|\})"
+color brightmagenta "(\(\)|\[|\]|\{|\})"
 
 # Strings
 #color green "\"(\\.|[^\\\"])*\"|'(\\.|[^\\'])*'"
diff --git a/maincf.nanorc b/maincf.nanorc
index c15e5eb..f11642e 100644
--- a/maincf.nanorc
+++ b/maincf.nanorc
@@ -1,5 +1,5 @@
 ### all *cf files (e.g. main.cf, Postfix )
-syntax "maincf" "(\.|/|)cf$"
+syntax "maincf" "(\.|/)cf$"
 color magenta "\=.*$"
 color green "#.*$"
 color cyan "[A-Z0-9\_]+="
diff --git a/mcchangelog.nanorc b/mcchangelog.nanorc
index 03f23e8..9f8a8cd 100644
--- a/mcchangelog.nanorc
+++ b/mcchangelog.nanorc
@@ -1,19 +1,19 @@
-## Changelog file syntax 
-## 
-syntax "changelogs" "ChangeLog*" 
+## Changelog file syntax
+##
+syntax "changelogs" "ChangeLog*"
 
-color green "\+" 
-color red "\-" 
-color brightwhite "[0-9]" 
-color brightblue "[0-9][0-9]\:[0-9][0-9]\:[0-9][0-9]" 
-color blue "[0-9][0-9][0-9][0-9]\-[0-9][0-9]\-[0-9][0-9]" 
-color blue "[0-9][0-9][0-9][0-9]\/[0-9][0-9]\/[0-9][0-9]" 
-color blue "\<(CEST|CET|CST||CDT|EDT)\>" 
-color yellow "[0-9]\..*$" 
-color cyan "\*.*$" 
-color brightblue "\<(pre.*$|beta.*$|rc.*$|release.*$)\>" 
-color green "#.*$" 
-icolor brightred "^[[:space:]]*[.0-9A-Z_]*:" 
-color green "[[:space:]]*[.0-9A-Z_]*[[:space:]]*[.0-9A-Z_]*[[:space:]]<" 
-color brightyellow "<.*>$" 
-color brightwhite "commit[[:space:]]*[.0-9A-Z_]*$"
\ No newline at end of file
+color green "\+"
+color red "\-"
+color brightwhite "[0-9]"
+color brightblue "[0-9][0-9]\:[0-9][0-9]\:[0-9][0-9]"
+color blue "[0-9][0-9][0-9][0-9]\-[0-9][0-9]\-[0-9][0-9]"
+color blue "[0-9][0-9][0-9][0-9]\/[0-9][0-9]\/[0-9][0-9]"
+color blue "\<(CEST|CET|CST|CDT|EDT)\>"
+color yellow "[0-9]\..*$"
+color cyan "\*.*$"
+color brightblue "\<(pre.*$|beta.*$|rc.*$|release.*$)\>"
+color green "#.*$"
+icolor brightred "^[[:space:]]*[.0-9A-Z_]*:"
+color green "[[:space:]]*[.0-9A-Z_]*[[:space:]]*[.0-9A-Z_]*[[:space:]]<"
+color brightyellow "<.*>$"
+color brightwhite "commit[[:space:]]*[.0-9A-Z_]*$"
diff --git a/others.nanorc b/others.nanorc
index e7d4b84..aef33a7 100644
--- a/others.nanorc
+++ b/others.nanorc
@@ -59,7 +59,7 @@ syntax "m3u" "\.m3u$"
 color green "#.*$"
 color brightgreen "http.*$"
 color yellow "\/"
-color cyan "[.0-9a-zA-Z_-]*\.mp3"
+color cyan "[.0-9a-zA-Z_\-]*\.mp3"
 
 syntax "bat" "\.bat$"
 color yellow "%(\\.|[^\"])*%"
@@ -106,7 +106,7 @@ color green "dir[[:space:]].*$"
 icolor cyan "^[[:space:]]*[.0-9A-Z_]*"
 color brightgreen "/usr/shar(e|e/(doc|e/man))/|/include/|/lib/|/usr/"
 color yellow "/etc/"
-color brightblue "/usr/bin(/|)|/usr/sbin|/bin|/sbin|/etc/init.d/"
+color brightblue "/usr/bin(/)|/usr/sbin|/bin|/sbin|/etc/init.d/"
 color brightyellow "/etc/conf.d/"
 color red "/va(r/|r/cache|r/lib/)"
 color brightred "/var/cache/"
diff --git a/paludis.nanorc b/paludis.nanorc
index 6d167c5..4147fa9 100644
--- a/paludis.nanorc
+++ b/paludis.nanorc
@@ -4,7 +4,7 @@ color brightblack "^.+$"
 ## sh syntax:
 color brightwhite "\<(case|do|done|elif|else|esac|exit|fi|for|function|if|in|local|read|return|select|shift|then|time|until|while)\>"
 icolor magenta "(.+\)|\[.+\])"
-color brightwhite "(\{|\}|\(|\)|\;|\]|\[|`|\\|\$|<|>|!|==|&|\|)"
+color brightwhite "(\{|\}|\(\)|\;|\]|\[|`|\\|\$|<|>|!|==|&)"
 color brightwhite "-[Ldefgruwx]\>"
 color brightwhite "-(eq|ne|gt|lt|ge|le|s|n|z)\>"
 color brightblue "\<(cat|cd|chmod|chown|cp|echo|env|export|grep|install|let|ln|make|mkdir|mv|rm|sed|set|tar|touch|umask|unset)\>"
diff --git a/passwd.nanorc b/passwd.nanorc
index 7e194cc..e450592 100644
--- a/passwd.nanorc
+++ b/passwd.nanorc
@@ -1,5 +1,5 @@
 ###  etc/passwd
-syntax "passwd" "(\.|/|)passwd$" "(\.|/|)shadow$"
+syntax "passwd" "(\.|/)passwd$" "(\.|/)shadow$"
 color white ".*$"
 color blue "\:.*$"
 color yellow "\:*\:"
diff --git a/postgresql.nanorc b/postgresql.nanorc
index 7647965..c7575fb 100644
--- a/postgresql.nanorc
+++ b/postgresql.nanorc
@@ -1,5 +1,5 @@
 syntax "postgreSQL" "\.sql$"
-icolor red "\<(A(LL|NALY(S|Z)E|ND|NY|RRAY|S|SC|SYMMETRIC|UTHORIZATION)|B(ETWEEN|INARY|OTH|Y)|C(ASE|AST|HECK|OLLATE|OLUMN|ONSTRAINT|REATE|ROSS|URRENT_(DATE|ROLE|TIME|TIMESTAMP|USER))|D(EFAULT|EFERRABLE|ESC|ISTINCT|O|ROP)|E(LSE|ND|XCEPT)|F(ALSE|OR(EIGN)?|REEZE|ROM|ULL)|GRANT|GROUP|HAVING|I(LIKE|N(ITIALLY|NER|TERSECT|TO)?|S|SNULL)|JOIN|L(EADING|EFT|IKE|IMIT|OCALTIME(STAMP)?)|N(ATURAL|EW|OT(NULL)?|ULL)|O(FF(SET)?|LD|N|NLY|R|RDER|UTER|VERLAPS)|PLACING|PRIMARY|REFERENCES|RIGHT|S(ELECT|ESSION_USER|IMILAR|OME|YMMETRIC)|T(ABLE|HEN|O|RAILING|RUE)|UNION|UNIQUE|USER|USING|VE(IW|RBOSE)|WHEN|WHERE|)\>"
-color magenta "(\{|\}|\(|\)|\;|\]|\[|`|\\|\$|<|>|!|=|&|\|)"
+icolor red "\<(A(LL|NALY(S|Z)E|ND|NY|RRAY|S|SC|SYMMETRIC|UTHORIZATION)|B(ETWEEN|INARY|OTH|Y)|C(ASE|AST|HECK|OLLATE|OLUMN|ONSTRAINT|REATE|ROSS|URRENT_(DATE|ROLE|TIME|TIMESTAMP|USER))|D(EFAULT|EFERRABLE|ESC|ISTINCT|O|ROP)|E(LSE|ND|XCEPT)|F(ALSE|OR(EIGN)?|REEZE|ROM|ULL)|GRANT|GROUP|HAVING|I(LIKE|N(ITIALLY|NER|TERSECT|TO)?|S|SNULL)|JOIN|L(EADING|EFT|IKE|IMIT|OCALTIME(STAMP)?)|N(ATURAL|EW|OT(NULL)?|ULL)|O(FF(SET)?|LD|N|NLY|R|RDER|UTER|VERLAPS)|PLACING|PRIMARY|REFERENCES|RIGHT|S(ELECT|ESSION_USER|IMILAR|OME|YMMETRIC)|T(ABLE|HEN|O|RAILING|RUE)|UNION|UNIQUE|USER|USING|VE(IW|RBOSE)|WHEN|WHERE)\>"
+color magenta "(\{|\}|\(\)|\;|\]|\[|`|\\|\$|<|>|!|=|&)"
 color yellow "'[^']*'"
 color green "--.*$"
diff --git a/pov.nanorc b/pov.nanorc
index cb5cc4b..26e3dcc 100644
--- a/pov.nanorc
+++ b/pov.nanorc
@@ -8,7 +8,7 @@ color brightyellow "\<(fog_type|fog_offset|fog_alt|rgb|distance|transform)\>"
 color brightred "^\<(texture)\>"
 color brightred "\<(light_source|background)\>"
 color brightred "\<(fog|object|camera)\>"
-color green "(\{|\}|\(|\)|\;|\]|\[|`|\\|\$|<|>|!|=|&|\|)"
+color green "(\{|\}|\(\)|\;|\]|\[|`|\\|\$|<|>|!|=|&)"
 color brightmagenta "\<(union|group|subgroup)\>"
 ## Comment highlighting
 color brightblue "//.*"
diff --git a/privoxy.nanorc b/privoxy.nanorc
index c4d16ae..a98a161 100644
--- a/privoxy.nanorc
+++ b/privoxy.nanorc
@@ -1,4 +1,4 @@
-syntax "privoxycfg" "(\.|/|)privoxy/config$"
+syntax "privoxycfg" "(\.|/)privoxy/config$"
 color brightwhite "[0-9]"
 color cyan "^[[:space:]]*[.a-z0-9-]*"
 color brightgreen "\ 1"
@@ -10,11 +10,11 @@ color magenta "http:.*$"
 # important config settings without which it may not work the way You want it to :)
 color yellow "(listen-address|forward|accept-intercepted-requests)"
 
-# comments 
+# comments
 color green "#.*$"
 
 #######################################
-syntax "privoxyaction" "(\.|/|).action$"
+syntax "privoxyaction" "(\.|/).action$"
 
 color brightyellow start="\{" end="\}"
 color cyan "(\+|\-)(add-header|block|client-header-(filter|tagger)|content-type-overwrite|crunch-(client-header|if-none-match|server-header))"
@@ -24,13 +24,13 @@ color cyan "(\+|\-)(handle-as-image|inspect-jpegs|limit-connect|overwrite-last-m
 color cyan "(\+|\-)(session-cookies-only|set-image-blocker|crunch-(outgoing|incoming)-cookies|kill-popups|redirect|send(-|-vanilla-)wafer)"
 
 color yellow "\{\{(settings|alias)\}\}"
-# comments 
+# comments
 color green "#.*$"
 color brightwhite "##.*$"
 color brightgreen "#-.*$"
 
 #######################################
-#syntax "privoxytemplate" "/etc/privoxy/templates/(\.|/|)"
+#syntax "privoxytemplate" "/etc/privoxy/templates/(\.|/)"
 #color white "^.+$"
 #color green  start="<" end=">"
 #color cyan   "<[^> ]+"
diff --git a/profile.nanorc b/profile.nanorc
index 066da80..cd92305 100644
--- a/profile.nanorc
+++ b/profile.nanorc
@@ -1,5 +1,5 @@
 ### all *profile files ( ~/.bash_profile, /etc/profile)
-syntax "profiles" "(\.|/|)profile$"
+syntax "profiles" "(\.|/)profile$"
 color red "'(\\.|[^'])*'"
 color blue ""(\\.|[^\"])*""
 color magenta "[a-zA-Z0-9\_]+="
diff --git a/rcfiles-new.nanorc b/rcfiles-new.nanorc
index ee309bb..566910e 100644
--- a/rcfiles-new.nanorc
+++ b/rcfiles-new.nanorc
@@ -1,5 +1,5 @@
 ## this .rc is not meant for rcs in etc but those used in apps like wine
-syntax "rc" "\.rc$" 
+syntax "rc" "\.rc$"
 color cyan start="\{" end="\}"
 color brightgreen start="<" end=">"
 color brightyellow "(\"(\\.|[^\"])*\"|[0-9])"
@@ -7,7 +7,7 @@ color green start="\/\*" end="\*\/"
 color yellow "(#(define|include)|LANGUAGE|FONT)"
 
 ### all *rc files  ( e.g. .bashrc, inputrc, xtermcontrol .... )
-#syntax "rcfiles" "(\.|/|)rc$" "(\.|/|)control$"
+#syntax "rcfiles" "(\.|/)rc$" "(\.|/)control$"
 syntax "rcfiles" "((.ba|ba|c|.c)sh|input|xinit|eix|(.w|w)minet)|gtk|rc$"
 color red "'(\\.|[^'])*'"
 color blue ""(\\.|[^\"])*""
diff --git a/rcfiles.nanorc b/rcfiles.nanorc
index 9a93e5a..4cec9d6 100644
--- a/rcfiles.nanorc
+++ b/rcfiles.nanorc
@@ -1,5 +1,5 @@
 ### all *rc files  ( e.g. .bashrc, inputrc, xtermcontrol .... )
-syntax "rcfiles" "\rc$" "(\.|/|)control$"
+syntax "rcfiles" "\rc$" "(\.|/)control$"
 color red "'(\\.|[^'])*'"
 color blue ""(\\.|[^\"])*""
 color magenta "[A-Z0-9\_]+="
diff --git a/sources_list.nanorc b/sources_list.nanorc
index e10235d..7232a87 100644
--- a/sources_list.nanorc
+++ b/sources_list.nanorc
@@ -3,14 +3,14 @@
 ## syntax highlighting for /etc/apt/sources.list
 syntax "apt/sources.list" "sources\.list(\.old|~)?$"
 # component
-color brightmagenta "^deb(-src)? ((http|file|ftp):/[^ ]+|cdrom:\[[^\]]+\]/|cdrom:\[[a-zA-Z0-9\._-\(\) ]+\]/) [^ ]+ .+$"
+color brightmagenta "^deb(-src)? ((http|file|ftp):/[^ ]+|cdrom:\[[^\]]+\]/|cdrom:\[[a-zA-Z0-9\._\-\(\) ]+\]/) [^ ]+ .+$"
 # distribution
-color brightred "^deb(-src)? ((http|file|ftp):/[^ ]+|cdrom:\[[^\]]+\]/|cdrom:\[[a-zA-Z0-9\._-\(\) ]+\]/) [^ ]+"
+color brightred "^deb(-src)? ((http|file|ftp):/[^ ]+|cdrom:\[[^\]]+\]/|cdrom:\[[a-zA-Z0-9\._\-\(\) ]+\]/) [^ ]+"
 # URI
 color brightgreen "(http|file|ftp):/[^ ]+"
 # cdroms
 # [^\]] does not work…
-color brightgreen "cdrom:\[[a-zA-Z0-9\._-\(\) ]+\]/"
+color brightgreen "cdrom:\[[a-zA-Z0-9\._\-\(\) ]+\]/"
 # deb / deb-src
 color cyan "^deb"
 color brightblue "^deb-src"
diff --git a/tab.nanorc b/tab.nanorc
index 68ae7b9..c92857d 100644
--- a/tab.nanorc
+++ b/tab.nanorc
@@ -1,5 +1,5 @@
 ### all *tab files ( e.g. fstab, crontab, inittab )
-syntax "fstab" "(\.|/|)tab$"
+syntax "fstab" "(\.|/)tab$"
 color magenta "\<(none)\>.*$" "\<(wait)\>" "\<(respawn)\>"
 color red "/dev/hd.*$" "\<(ctrlaltdel)\>" "\<(initdefault)\>"
 color blue "/dev/sr.*$" "/dev/cd.*$" "\/sbin.*$"
diff --git a/tcl.nanorc b/tcl.nanorc
index 15526c1..434ac3a 100644
--- a/tcl.nanorc
+++ b/tcl.nanorc
@@ -9,8 +9,8 @@ color green "\<(string bytelength|string compare|string equal|string first|strin
 color green "\<(alarm|auto_load_pkg|bsearch|catclose|catgets|catopen|ccollate|cconcat|cequal|chgrp|chmod|chown|chroot|cindex|clength|cmdtrace|commandloop|crange|csubstr|ctoken|ctype|dup|echo|execl|fcntl|flock|fork|fstat|ftruncate|funlock|host_info|id|infox|keyldel|keylget|keylkeys|keylset|kill|lassign|lcontain|lempty|lgets|link|lmatch|loadlibindex|loop|lvarcat|lvarpop|lvarpush|max|min|nice|pipe|profile|random|readdir|replicate|scancontext|scanfile|scanmatch|select|server_accept|server_create|signal|sleep|sync|system|tclx_findinit|tclx_fork|tclx_load_tndxs|tclx_sleep|tclx_system|tclx_wait|times|translit|try_eval|umask|wait)\>"
 ## Syntax.
 color brightblue "proc[[:space:]]" "(\{|\})"
-color green "(\(|\)|\;|`|\\|\$|<|>|!|=|&|\|)"
+color green "(\(\)|\;|`|\\|\$|<|>|!|=|&)"
 color brightyellow ""(\\.|[^"])*"" "'(\\.|[^'])*'"
 icolor brightred "\$\{?[0-9A-Z_!@#$*?-]+\}?"
 color ,green "[[:space:]]+$"
-color ,magenta "^([[:space:]]+|)#.*"
+color ,magenta "^([[:space:]]+)#.*"
diff --git a/vhost.nanorc b/vhost.nanorc
index 2cbcf2e..7970f86 100644
--- a/vhost.nanorc
+++ b/vhost.nanorc
@@ -1,7 +1,7 @@
 ## Apache httpd.conf highlighting
 ##
 #how to add sites-enabled files?  "default" is too generic to keep in here I think
-syntax "vhost" "(\.|/|)vhost\.conf"
+syntax "vhost" "(\.|/)vhost\.conf"
 color brightwhite "(ServerRoot|(Lock|Pid)File|Timeout|(Max)?KeepAlive(Requests|Timeout)?)"
 color brightwhite "(User|Group|LogFormat|ErrorLog|Include|(Script)?Alias)"
 color brightwhite "(ErrorDocument|AccessFileName|UseCanonicalName|TypesConfig|DefaultType)"
@@ -37,6 +37,6 @@ color white ""(\\.|[^\"])*""
 # lines (the trailing characters from ] to the EOL are not highlighted.
 # if anyone knows how to make it work, let me know.. ;)
 color white "[[:space:]]+(/[/\[\^#A-Za-z0-9\.\*\_\-]+)+"
-color green "^[[:space:]]*#.*" 
+color green "^[[:space:]]*#.*"
 color cyan "\<(ServerName|Serveralias|DocumentRoot|DirectoryIndex|ErrorLog|CustomLog)\>"
 
diff --git a/xdefaults.nanorc b/xdefaults.nanorc
index f57261e..8581831 100644
--- a/xdefaults.nanorc
+++ b/xdefaults.nanorc
@@ -1,5 +1,5 @@
 ## Xdefaults
-syntax "Xdefaults" "(\.|/|)default.$" "(\.|/|)resource.$" "fonts.alias"
+syntax "Xdefaults" "(\.|/)default.$" "(\.|/)resource.$" "fonts.alias"
 color magenta "XTerm"
 color cyan "Rxvt"
 color white "\*(\\.|[^'])*\:"