From 418f655bfaee62e8a371437c7a442a1d08c4c34f Mon Sep 17 00:00:00 2001
From: Adam Chlipala <adamc@hcoop.net>
Date: Sun, 12 Oct 2008 10:30:08 -0400
Subject: Get type definitions font-locking again

---
 src/elisp/urweb-mode.el |  4 ++--
 tests/crud.urs          | 30 +++++++++++++++---------------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/elisp/urweb-mode.el b/src/elisp/urweb-mode.el
index b5e0527d..626fdc63 100644
--- a/src/elisp/urweb-mode.el
+++ b/src/elisp/urweb-mode.el
@@ -164,10 +164,10 @@ See doc for the variable `urweb-mode-info'."
   `(;;(urweb-font-comments-and-strings)
     (,(concat "\\<\\(fun\\|and\\)\\s-+\\(\\sw+\\)\\s-+[^ \t\n=]")
      (1 font-lock-keyword-face)
-     (6 font-lock-function-name-face))
+     (5 font-lock-function-name-face))
     (,(concat "\\<\\(\\(data\\)?type\\|con\\)\\s-+\\(\\sw+\\)")
      (1 font-lock-keyword-face)
-     (7 font-lock-type-def-face))
+     (3 font-lock-type-def-face))
     ("\\<\\(val\\)\\s-+\\(\\sw+\\>\\s-*\\)?\\(\\sw+\\)\\s-*[=:]"
      (1 font-lock-keyword-face)
      (3 font-lock-variable-name-face))
diff --git a/tests/crud.urs b/tests/crud.urs
index 8ef81b87..866853d5 100644
--- a/tests/crud.urs
+++ b/tests/crud.urs
@@ -1,21 +1,21 @@
-con colMeta = fn t_formT :: (Type * Type) => {
-        Nam : string,
-        Show : t_formT.1 -> xbody,
-        Widget : nm :: Name -> xml form [] [nm = t_formT.2],
-        WidgetPopulated : nm :: Name -> t_formT.1 -> xml form [] [nm = t_formT.2],
-        Parse : t_formT.2 -> t_formT.1,
-        Inject : sql_injectable t_formT.1
-}
+con colMeta = fn t_formT :: (Type * Type) =>
+                 {Nam : string,
+                  Show : t_formT.1 -> xbody,
+                  Widget : nm :: Name -> xml form [] [nm = t_formT.2],
+                  WidgetPopulated : nm :: Name -> t_formT.1
+                                          -> xml form [] [nm = t_formT.2],
+                  Parse : t_formT.2 -> t_formT.1,
+                  Inject : sql_injectable t_formT.1}
 con colsMeta = fn cols :: {(Type * Type)} => $(mapT2T colMeta cols)
 
 functor Make(M : sig
-        con cols :: {(Type * Type)}
-        constraint [Id] ~ cols
-        val tab : sql_table ([Id = int] ++ mapT2T fstTT cols)
+                 con cols :: {(Type * Type)}
+                 constraint [Id] ~ cols
+                 val tab : sql_table ([Id = int] ++ mapT2T fstTT cols)
 
-        val title : string
+                 val title : string
 
-        val cols : colsMeta cols
-end) : sig
-        val main : unit -> transaction page
+                 val cols : colsMeta cols
+             end) : sig
+    val main : unit -> transaction page
 end
-- 
cgit v1.2.3