From 3e7f74c58877acc5cb893b160f4741f7e63aa9e7 Mon Sep 17 00:00:00 2001
From: Pavel Roskin <proski@gnu.org>
Date: Fri, 27 Sep 2002 03:33:39 +0000
Subject: [PATCH] * syntax/syntax.syntax: Don't start keywords with "[" - it
 doesn't work.  Use "[]" at the end of keywords to suppress their special
 meaning.

---
 ChangeLog            |  6 +++++
 syntax/syntax.syntax | 57 ++++++++++++++++++++++++++------------------
 2 files changed, 40 insertions(+), 23 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 90925c84d..2b2e828b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-09-26  Pavel Roskin  <proski@gnu.org>
+
+	* syntax/syntax.syntax: Don't start keywords with "\[" - it
+	doesn't work.  Use "\[\]" at the end of keywords to suppress
+	their special meaning.
+
 2002-09-22  Pavel Roskin  <proski@gnu.org>
 
 	* doc/Makefile.am: Remove width from the man2hlp command line.
diff --git a/syntax/syntax.syntax b/syntax/syntax.syntax
index 156229fa3..87241c561 100644
--- a/syntax/syntax.syntax
+++ b/syntax/syntax.syntax
@@ -1,27 +1,38 @@
+# Syntax highlighting rules for syntax highlighting rules
+
+# Use \[\] at the end of keywords to suppress their special meaning
+
+wholechars abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_.\\[]{}
+
 context default
-    keyword whole linestart \[\s\t\]spellcheck yellow/24
-    keyword whole linestart \[\s\t\]keyword yellow/24
-    keyword whole whole\[\t\s\]l\inestart brightcyan/17
-    keyword whole whole\[\t\s\]l\inestart brightcyan/17
-    keyword whole wh\oleleft\[\t\s\]l\inestart brightcyan/17
-    keyword whole wh\oleright\[\t\s\]l\inestart brightcyan/17
-    keyword whole l\inestart\[\t\s\]wh\ole
-    keyword whole l\inestart\[\t\s\]wh\ole
-    keyword whole l\inestart\[\t\s\]wh\oleleft
-    keyword whole l\inestart\[\t\s\]wh\oleright
-    keyword wholeleft whole\s brightcyan/17
-    keyword wholeleft whole\t brightcyan/17
-    keyword whole wh\oleleft brightcyan/17
-    keyword whole wh\oleright brightcyan/17
-    keyword whole lin\estart brightcyan/17
-    keyword whole linestart \[\s\t\]context\[\t\s\]exclusive brightred/18
-    keyword whole linestart \[\s\t\]context\[\t\s\]default brightred/18
-    keyword whole linestart \[\s\t\]context brightred/18
-    keyword whole wh\olechars\[\t\s\]left brightcyan/17
-    keyword whole wh\olechars\[\t\s\]right brightcyan/17
-    keyword whole wh\olechars brightcyan/17
-    keyword whole linestart file brightgreen/6
-    keyword whole linestart include brightred/18
+# Invalid combinations, not highlighted
+    keyword whole linestart\[\t\s\]whole
+    keyword whole linestart\[\t\s\]whole
+    keyword whole linestart\[\t\s\]wholeleft
+    keyword whole linestart\[\t\s\]wholeright
+
+# Combinations below are valid
+    keyword whole whole\[\t\s\]linestart brightcyan/17
+    keyword whole whole\[\t\s\]linestart brightcyan/17
+    keyword whole wholeleft\[\t\s\]linestart brightcyan/17
+    keyword whole wholeright\[\t\s\]linestart brightcyan/17
+    keyword whole whole\[\] brightcyan/17
+    keyword whole wholeleft\[\] brightcyan/17
+    keyword whole wholeright\[\] brightcyan/17
+    keyword whole linestart\[\] brightcyan/17
+
+    keyword whole wholechars\[\t\s\]left brightcyan/17
+    keyword whole wholechars\[\t\s\]right brightcyan/17
+    keyword whole wholechars\[\] brightcyan/17
+
+    keyword whole spellcheck\[\] yellow/24
+    keyword whole keyword\[\] yellow/24
+    keyword whole context\[\t\s\]exclusive brightred/18
+    keyword whole context\[\t\s\]default brightred/18
+    keyword whole context\[\] brightred/18
+
+    keyword whole linestart file\[\] brightgreen/6
+    keyword whole linestart include\[\] brightred/18
 
     keyword whole 0 lightgray/0	blue/26
     keyword whole 1 lightgray/1	blue/26