From 4dbe6133e8cbab6c1d23974f539d28b013e89a3b Mon Sep 17 00:00:00 2001 From: Pavel Roskin Date: Thu, 18 Jul 2002 16:36:52 +0000 Subject: [PATCH] * syntax/c.syntax: Reenable highlighting for "/" and preserve highlighting for "//" comments by using exclusive context. * syntax/java.syntax: Likewise. * syntax/swig.syntax: Likewise. * syntax/slang.syntax: Reenable highlighting for "/". * syntax/sql.syntax: Enable highlighting for "/" and "-". --- ChangeLog | 7 +++++++ syntax/c.syntax | 5 +++-- syntax/java.syntax | 5 +++-- syntax/pascal.syntax | 7 ++++--- syntax/slang.syntax | 2 +- syntax/sql.syntax | 12 ++++++++---- syntax/swig.syntax | 5 +++-- 7 files changed, 29 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index 69d4599a7..2e2663d8c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2002-07-18 Pavel Roskin + * syntax/c.syntax: Reenable highlighting for "/" and preserve + highlighting for "//" comments by using exclusive context. + * syntax/java.syntax: Likewise. + * syntax/swig.syntax: Likewise. + * syntax/slang.syntax: Reenable highlighting for "/". + * syntax/sql.syntax: Enable highlighting for "/" and "-". + * syntax/sql.syntax: New file. * syntax/Syntax: Add sql.syntax. * syntax/Makefile.am: Likewise. diff --git a/syntax/c.syntax b/syntax/c.syntax index e93bdf9d6..86cfdd58a 100644 --- a/syntax/c.syntax +++ b/syntax/c.syntax @@ -65,6 +65,7 @@ context default keyword /\* brown/22 keyword \*/ brown/22 + keyword // brown/22 keyword '\\\{"abtnvfr\}' brightgreen/16 keyword '\\\{0123\}\{01234567\}\{01234567\}' brightgreen/16 @@ -78,7 +79,7 @@ context default keyword \+ yellow/24 keyword - yellow/24 keyword \* yellow/24 -# keyword / yellow/24 + keyword / yellow/24 keyword % yellow/24 keyword = yellow/24 keyword != yellow/24 @@ -94,7 +95,7 @@ context default keyword ; brightmagenta/19 context exclusive /\* \*/ brown/22 spellcheck -context // \n brown/22 +context exclusive // \n brown/22 spellcheck context linestart # \n brightred/18 keyword \\\n yellow/24 diff --git a/syntax/java.syntax b/syntax/java.syntax index fad8cc6a9..098fe3604 100644 --- a/syntax/java.syntax +++ b/syntax/java.syntax @@ -107,6 +107,7 @@ context default keyword /\* brown/22 keyword \*/ brown/22 + keyword // brown/22 keyword '\s' brightgreen/16 keyword '+' brightgreen/16 @@ -115,7 +116,7 @@ context default keyword \+ yellow/24 keyword - yellow/24 keyword \* yellow/24 -# keyword / yellow/24 + keyword / yellow/24 keyword % yellow/24 keyword = yellow/24 keyword != yellow/24 @@ -131,7 +132,7 @@ context default keyword ; brightmagenta/19 context exclusive /\* \*/ brown/22 spellcheck -context // \n brown/22 +context exclusive // \n brown/22 spellcheck context linestart # \n brightred/18 keyword \\\n yellow/24 diff --git a/syntax/pascal.syntax b/syntax/pascal.syntax index c8a85cd20..5a77c4206 100644 --- a/syntax/pascal.syntax +++ b/syntax/pascal.syntax @@ -99,12 +99,13 @@ context default yellow/24 keyword whole xor white/25 keyword whole .. white/25 + keyword // brightgreen/22 + keyword > cyan/5 keyword < cyan/5 keyword \+ cyan/5 keyword - cyan/5 -# the following must be commented out for the sake of singleline comments(//) -# keyword / cyan/5 + keyword / cyan/5 keyword % lightgray/5 keyword = lightgray/5 keyword [ lightgray/5 @@ -118,7 +119,7 @@ context default yellow/24 # keyword {$*} brightred/19 context ' ' brightcyan/22 -context // \n brightgreen/22 +context exclusive // \n brightgreen/22 keyword $+:*$ black/13 green/13 context exclusive (\*\* \*) brightgreen/22 black/22 keyword $+:*$ black/13 green/13 diff --git a/syntax/slang.syntax b/syntax/slang.syntax index 9ba98317c..20c9bb1ba 100644 --- a/syntax/slang.syntax +++ b/syntax/slang.syntax @@ -72,7 +72,7 @@ context default keyword \+ white/24 keyword - white/24 keyword \* white/24 -# keyword / white/24 + keyword / white/24 keyword = white/24 keyword != white/24 keyword == white/24 diff --git a/syntax/sql.syntax b/syntax/sql.syntax index 97ba68ec2..128360723 100644 --- a/syntax/sql.syntax +++ b/syntax/sql.syntax @@ -460,12 +460,16 @@ context default keyword whole year yellow/24 keyword whole zone yellow/24 + keyword /\* brown/22 + keyword \*/ brown/22 + keyword -- brown/22 + keyword > brightcyan/14 keyword < brightcyan/14 keyword \+ brightcyan/14 - keyword \s-\s brightcyan/14 + keyword - brightcyan/14 keyword \* brightcyan/14 - keyword \s/\s brightcyan/14 + keyword / brightcyan/14 keyword % brightcyan/14 keyword = brightcyan/14 keyword ( brightcyan/14 @@ -476,10 +480,10 @@ context default context # \n brown/22 spellcheck -context -- \n brown/22 +context exclusive -- \n brown/22 spellcheck -context /\* \*/ brown/22 +context exclusive /\* \*/ brown/22 spellcheck context ' ' green/6 diff --git a/syntax/swig.syntax b/syntax/swig.syntax index 1053e5f02..ad177bc88 100644 --- a/syntax/swig.syntax +++ b/syntax/swig.syntax @@ -104,6 +104,7 @@ context default keyword /\* brown/22 keyword \*/ brown/22 + keyword // brown/22 keyword '\\\{"abtnvfr\}' brightgreen/16 keyword '\\\{0123\}\{01234567\}\{01234567\}' brightgreen/16 @@ -117,7 +118,7 @@ context default keyword \+ yellow/24 keyword - yellow/24 keyword \* yellow/24 -# keyword / yellow/24 + keyword / yellow/24 keyword % yellow/24 keyword = yellow/24 keyword != yellow/24 @@ -133,7 +134,7 @@ context default keyword ; brightmagenta/19 context exclusive /\* \*/ brown/22 spellcheck -context // \n brown/22 +context exclusive // \n brown/22 spellcheck context linestart # \n brightred/18 keyword \\\n yellow/24