summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Adam Chlipala <adamc@hcoop.net>2008-10-13 15:31:02 -0400
committerGravatar Adam Chlipala <adamc@hcoop.net>2008-10-13 15:31:02 -0400
commitcf62ed3325e024601d3d04d638b6a0aa383310ae (patch)
treedac179bd4bae0bcf8f083b0db03d8391f582e2ea
parent2fc202f5ac5f243151ea56185b6dc9739f7546aa (diff)
Reorder font-lock rules to deal better with CDATA
-rw-r--r--src/elisp/urweb-mode.el20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/elisp/urweb-mode.el b/src/elisp/urweb-mode.el
index 217537e0..d2cbfb3e 100644
--- a/src/elisp/urweb-mode.el
+++ b/src/elisp/urweb-mode.el
@@ -181,6 +181,16 @@ See doc for the variable `urweb-mode-info'."
(defconst urweb-font-lock-keywords
`(;;(urweb-font-comments-and-strings)
+ ("\\(<\\sw+\\)\\(\\s-\\|\\sw\\|=\\|\"[^\"]*\"\\|{[^}]*}\\)*/?\\(>\\)"
+ (1 font-lock-tag-face)
+ (3 font-lock-tag-face))
+ ("\\(</\\sw+>\\)"
+ (1 font-lock-tag-face))
+ ("\\([^<>{}]+\\)"
+ (1 (if (save-excursion (inXml 0))
+ font-lock-string-face
+ nil)))
+
("\\<\\(fun\\|and\\)\\s-+\\(\\sw+\\)\\s-+[^ \t\n=]"
(1 font-lock-keyword-face)
(2 font-lock-function-name-face))
@@ -196,16 +206,6 @@ See doc for the variable `urweb-mode-info'."
("\\<\\(signature\\)\\s-+\\(\\sw+\\)"
(1 font-lock-keyword-face)
(2 font-lock-interface-def-face))
-
- ("\\(<\\sw+\\)\\(\\s-\\|\\sw\\|=\\|\"[^\"]*\"\\|{[^}]*}\\)*/?\\(>\\)"
- (1 font-lock-tag-face)
- (3 font-lock-tag-face))
- ("\\(</\\sw+>\\)"
- (1 font-lock-tag-face))
- ("\\([^<>{}]+\\)"
- (1 (if (save-excursion (inXml 0))
- font-lock-string-face
- nil)))
(,urweb-keywords-regexp . font-lock-keyword-face)
(,urweb-sql-keywords-regexp . font-lock-sql-face)