Commit 93682179 authored by David Lawrence Ramsey's avatar David Lawrence Ramsey
Browse files

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
No related merge requests found
Showing with 11 additions and 3 deletions
+11 -3
...@@ -506,16 +506,22 @@ CVS code - ...@@ -506,16 +506,22 @@ CVS code -
- Add comments describing the relationships between syntax file - Add comments describing the relationships between syntax file
names and the names used as their short descriptions. (John M. names and the names used as their short descriptions. (John M.
Gabriele) Gabriele)
- doc/java.nanorc:
- Simplify a comment. (DLR)
- doc/man.nanorc: - doc/man.nanorc:
- Change the name of the "manpage" regexes to "man", for - Change the name of the "manpage" regexes to "man", for
consistency. (John M. Gabriele) consistency. (John M. Gabriele)
- doc/nanorc.nanorc: - doc/nanorc.nanorc:
- Tweak the "nanorc" regexes to color comments starting with a - Tweak the "nanorc" regexes to color comments starting with a
double ## cyan instead of bright blue. (John M. Gabriele) double ## cyan instead of bright blue. (John M. Gabriele)
- doc/ruby.nanorc:
- Add regex for "here" docs. (John M. Gabriele)
- doc/sh.nanorc: - doc/sh.nanorc:
- Tweak the regex for special variables, moving "-" to the end, - Tweak the regex for special variables, moving "-" to the end,
to avoid excessive coloring or an "Invalid range end" error. to avoid excessive coloring or an "Invalid range end" error.
(Benno Schulenberg) (Benno Schulenberg)
- Tweak the "sh" regexes to color comments cyan instead of
yellow. (John M. Gabriele)
- src/Makefile.am: - src/Makefile.am:
- If we're uninstalling, remove the "rnano" symlink. (DLR, found - If we're uninstalling, remove the "rnano" symlink. (DLR, found
by Benno Schulenberg) by Benno Schulenberg)
......
...@@ -204,7 +204,7 @@ ...@@ -204,7 +204,7 @@
## make use of such files (which can only include "syntax", "color", and ## make use of such files (which can only include "syntax", "color", and
## "icolor" commands) as follows: ## "icolor" commands) as follows:
## ##
## include "syntax file" ## include "/path/to/syntax_file.nanorc"
## ##
## Unless otherwise noted, the name of the syntax file (without the ## Unless otherwise noted, the name of the syntax file (without the
## ".nanorc" extension) should be the same as the "short description" ## ".nanorc" extension) should be the same as the "short description"
......
## Here is an example for Java source. ## Here is an example for Java.
## ##
syntax "java" "\.java$" syntax "java" "\.java$"
color green "\<(boolean|byte|char|double|float|int|long|new|short|this|transient|void)\>" color green "\<(boolean|byte|char|double|float|int|long|new|short|this|transient|void)\>"
......
...@@ -23,5 +23,7 @@ color green "'([^']|(\\'))*'" "%[qw]\{[^}]*\}" "%[qw]\([^)]*\)" "%[qw]<[^>]*>" " ...@@ -23,5 +23,7 @@ color green "'([^']|(\\'))*'" "%[qw]\{[^}]*\}" "%[qw]\([^)]*\)" "%[qw]<[^>]*>" "
## Comments ## Comments
color cyan "#[^{].*$" "#$" color cyan "#[^{].*$" "#$"
color brightcyan "##[^{].*$" "##$" color brightcyan "##[^{].*$" "##$"
## "Here" docs
color green start="<<-?'?EOT'?" end="^EOT"
## Some common markers ## Some common markers
color brightcyan "(XXX|TODO|FIXME|\?\?\?)" color brightcyan "(XXX|TODO|FIXME|\?\?\?)"
...@@ -8,5 +8,5 @@ color green "-[Ldefgruwx]\>" ...@@ -8,5 +8,5 @@ color green "-[Ldefgruwx]\>"
color green "-(eq|ne|gt|lt|ge|le|s|n|z)\>" 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)\>" 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 cyan "(^|[[:space:]])#.*$"
color brightyellow ""(\\.|[^"])*"" "'(\\.|[^'])*'" color brightyellow ""(\\.|[^"])*"" "'(\\.|[^'])*'"
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment