add minor nanorc regex tweaks by John M. Gabriele, and minor sh regex

tweaks by Benno Schulenberg

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

diff --git a/ChangeLog b/ChangeLog
index 037a1d9b0d8a3c01497213feb868fb7c0ad9aa1e..88bd467046417d0bfa2dc58bb3cdab7bdd691312 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -473,6 +473,12 @@ CVS code -
        - Simplify the extensions associated with the "nanorc" regexes.
          (DLR)
        - Add regexes for Ruby. (John M. Gabriele, minor tweaks by DLR)
+- doc/nanorc.nanorc:
+       - Tweak the "nanorc" regexes to color comments starting with a
+         double ## cyan instead of bright blue. (John M. Gabriele)
+- doc/sh.nanorc:
+       - Tweak the coloring of all special variables so that "-" is
+         highlighted properly. (Benno Schulenberg)
 - src/Makefile.am:
        - If we're uninstalling, remove the "rnano" symlink. (DLR, found
          by Benno Schulenberg)

diff --git a/doc/syntax/nanorc.nanorc b/doc/syntax/nanorc.nanorc
index c534ad5ead5e6f9d9236017122deeadce4e90c92..f63d770dfd2f3a8267b847dfe979f7c9f1479dbb 100644 (file)
--- a/doc/syntax/nanorc.nanorc
+++ b/doc/syntax/nanorc.nanorc
@@ -13,3 +13,4 @@ icolor magenta "^[[:space:]]*i?color\>" "\<(start|end)="
 icolor white ""(\\.|[^"])*""
 ## Comments
 icolor brightblue "^[[:space:]]*#.*$"
+icolor cyan "^[[:space:]]*##.*$"

diff --git a/doc/syntax/sh.nanorc b/doc/syntax/sh.nanorc
index fab9f11bb69700e823fc6664565cf36020836377..fd473ed091853bda5f8bf5b06206ad8cd5a51ea9 100644 (file)
--- a/doc/syntax/sh.nanorc
+++ b/doc/syntax/sh.nanorc
@@ -7,6 +7,6 @@ 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)\>"
-icolor brightred "\$\{?[0-9A-Z_!@#$*-?]+\}?"
+icolor brightred "\$\{?[0-9A-Z_!@#$*?-]+\}?"
 color yellow "(^|[[:space:]])#.*$"
 color brightyellow ""(\\.|[^"])*"" "'(\\.|[^'])*'"