diff --git a/ChangeLog b/ChangeLog index 85925009a9a100271d52138ff1d351081c01c4de..04d85ce98e1a7de916e2eac86bd6b1d075aad114 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2009-08-17 Mike Frysinger <vapier@gentoo.org> + * doc/syntax/(gentoo|sh|tcl).nanorc: Fix problems with empty regexes on POSIX. + Fixes Savannah bug 27175. + 2009-08-17 Chris Allegretta <chrisa@asty.org> * Initial soft line wrapping implementation. Command line flags -$ or --softwrap. diff --git a/doc/syntax/gentoo.nanorc b/doc/syntax/gentoo.nanorc index 8bafe2d67fdc871a4217b812adb48268de127b60..319b81bec426c80d38266731810d8b5bc54c97fd 100644 --- a/doc/syntax/gentoo.nanorc +++ b/doc/syntax/gentoo.nanorc @@ -20,10 +20,10 @@ color brightblue "\<e(begin|end|conf|install|make|qmake[34]|ant|(qa)?warn|infon? color brightblue "\<e(pause|beep|mktemp|(cvs|svn)_clean|punt_cxx)\>" "\<e(aclocal|auto(reconf|header|conf|make))\>" color brightblue "\<built_with_use\>" "\<make_desktop_entry\>" "\<unpack(_(makeself|pdv))?\>" color brightblue "\<die\>" "\<use(_(with|enable))?\>" "\<inherit\>" "\<has\>" "\<(has|best)_version\>" -color brightblue "\<(do|new)(ins|(games)?s?bin|doc|lib(|\.so|\.a)|man|info|exe|initd|confd|envd|pam|menu|icon)\>" +color brightblue "\<(do|new)(ins|(games)?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|gamesdirs)" -color brightblue "\<(|doc|ins|exe)into\>" "\<(f|games)(owners|perms)\>" "\<(exe|ins|dir)opts\>" +color brightblue "prepall(docs|info|man|strip)?" "prep(info|lib|lib\.(so|a)|man|strip|gamesdirs)" +color brightblue "\<(doc|ins|exe)?into\>" "\<(f|games)(owners|perms)\>" "\<(exe|ins|dir)opts\>" ## Highlight common commands used in ebuilds color blue "\<make\>" "\<(awk|cat|cd|chmod|chown|cp|echo|env|export|find|e?grep|ln|mkdir|mv|rm|sed|set|tar|touch|unset|xargs)\>" ## Highlight comments (doesnt work that well) diff --git a/doc/syntax/sh.nanorc b/doc/syntax/sh.nanorc index 61098e37effc55a0d8d6efbe8af6fc3a830a6e21..ecce22ecb799254e6ce899ab67e80e45433f95e2 100644 --- a/doc/syntax/sh.nanorc +++ b/doc/syntax/sh.nanorc @@ -1,7 +1,7 @@ ## Here is an example for Bourne shell scripts. ## syntax "sh" "\.sh$" -header "^#!.*/(ba|k|pdk|)sh[-0-9_]*" +header "^#!.*/(ba|k|pdk)?sh[-0-9_]*" icolor brightgreen "^[0-9A-Z_]+\(\)" 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 "(\{|\}|\(|\)|\;|\]|\[|`|\\|\$|<|>|!|=|&|\|)" diff --git a/doc/syntax/tcl.nanorc b/doc/syntax/tcl.nanorc index 15526c1a15648f63ae21de0ea921cbf59c8fae81..ad3401fbd73ad48da2b0840d8ab91edf9e0481c6 100644 --- a/doc/syntax/tcl.nanorc +++ b/doc/syntax/tcl.nanorc @@ -13,4 +13,4 @@ color green "(\(|\)|\;|`|\\|\$|<|>|!|=|&|\|)" color brightyellow ""(\\.|[^"])*"" "'(\\.|[^'])*'" icolor brightred "\$\{?[0-9A-Z_!@#$*?-]+\}?" color ,green "[[:space:]]+$" -color ,magenta "^([[:space:]]+|)#.*" +color ,magenta "^[[:space:]]*#.*"