add various minor regex and comment tweaks, mostly by John M. Gabriele

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

diff --git a/ChangeLog b/ChangeLog
index 026094026ce25a8dab50659b124b1a4934d9dc44..f6c8f7ebe6d37b3da1dbf425cab785dfe550d594 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -506,16 +506,22 @@ CVS code -
        - Add comments describing the relationships between syntax file
          names and the names used as their short descriptions. (John M.
          Gabriele)
+- doc/java.nanorc:
+       - Simplify a comment. (DLR)
 - doc/man.nanorc:
        - Change the name of the "manpage" regexes to "man", for
          consistency. (John M. Gabriele)
 - doc/nanorc.nanorc:
        - Tweak the "nanorc" regexes to color comments starting with a
          double ## cyan instead of bright blue. (John M. Gabriele)
+- doc/ruby.nanorc:
+       - Add regex for "here" docs. (John M. Gabriele)
 - doc/sh.nanorc:
        - Tweak the regex for special variables, moving "-" to the end,
          to avoid excessive coloring or an "Invalid range end" error.
          (Benno Schulenberg)
+       - Tweak the "sh" regexes to color comments cyan instead of
+         yellow. (John M. Gabriele)
 - src/Makefile.am:
        - If we're uninstalling, remove the "rnano" symlink. (DLR, found
          by Benno Schulenberg)

diff --git a/doc/nanorc.sample.in b/doc/nanorc.sample.in
index ec00dd361ef8e6183f4c52cdcd33581956ca0630..90aff7820b78ac92482e734b5a57e1c72fe98483 100644 (file)
--- a/doc/nanorc.sample.in
+++ b/doc/nanorc.sample.in
@@ -204,7 +204,7 @@
 ## make use of such files (which can only include "syntax", "color", and
 ## "icolor" commands) as follows:
 ##
-## include "syntax file"
+## include "/path/to/syntax_file.nanorc"
 ##
 ## Unless otherwise noted, the name of the syntax file (without the
 ## ".nanorc" extension) should be the same as the "short description"

diff --git a/doc/syntax/java.nanorc b/doc/syntax/java.nanorc
index 535ab92ce8adcdcb82ef46db07c9b4cf6fb7dc5a..a432f8174e6819f86fb053c8c9f3f38ded2a711f 100644 (file)
--- a/doc/syntax/java.nanorc
+++ b/doc/syntax/java.nanorc
@@ -1,4 +1,4 @@
-## Here is an example for Java source.
+## Here is an example for Java.
 ##
 syntax "java" "\.java$"
 color green "\<(boolean|byte|char|double|float|int|long|new|short|this|transient|void)\>"

diff --git a/doc/syntax/ruby.nanorc b/doc/syntax/ruby.nanorc
index 4526e53b82ad5feda8119ed7a124e4bbfb77cc76..7b16b65336ac021823a90fce603f0890e89c79f7 100644 (file)
--- a/doc/syntax/ruby.nanorc
+++ b/doc/syntax/ruby.nanorc
@@ -23,5 +23,7 @@ color green "'([^']|(\\'))*'" "%[qw]\{[^}]*\}" "%[qw]\([^)]*\)" "%[qw]<[^>]*>" "
 ## Comments
 color cyan "#[^{].*$" "#$"
 color brightcyan "##[^{].*$" "##$"
+## "Here" docs
+color green start="<<-?'?EOT'?" end="^EOT"
 ## Some common markers
 color brightcyan "(XXX|TODO|FIXME|\?\?\?)"

diff --git a/doc/syntax/sh.nanorc b/doc/syntax/sh.nanorc
index fd473ed091853bda5f8bf5b06206ad8cd5a51ea9..097f4852e9c9d6b1d52c5eac9ff602189a509ee4 100644 (file)
--- a/doc/syntax/sh.nanorc
+++ b/doc/syntax/sh.nanorc
@@ -8,5 +8,5 @@ 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_!@#$*?-]+\}?"
-color yellow "(^|[[:space:]])#.*$"
+color cyan "(^|[[:space:]])#.*$"
 color brightyellow ""(\\.|[^"])*"" "'(\\.|[^'])*'"