# HG changeset patch
# User wenzelm
# Date 1415386025 -3600
# Node ID 6585e59aee3e54f704a8b388e2fe9a846213bdaa
# Parent  5fd496c26e3b9fe39695bea5912e51e970c9352b
tuned markup;

diff -r 5fd496c26e3b -r 6585e59aee3e src/Pure/ML/ml_lex.ML
--- a/src/Pure/ML/ml_lex.ML	Fri Nov 07 17:43:50 2014 +0100
+++ b/src/Pure/ML/ml_lex.ML	Fri Nov 07 19:47:05 2014 +0100
@@ -44,7 +44,7 @@
   "type", "val", "where", "while", "with", "withtype"];
 
 val keywords2 =
- ["case", "do", "else", "end", "if", "in", "let", "local", "of",
+ ["and", "case", "do", "else", "end", "if", "in", "let", "local", "of",
   "sig", "struct", "then", "while", "with"];
 
 val keywords3 =
diff -r 5fd496c26e3b -r 6585e59aee3e src/Pure/ML/ml_lex.scala
--- a/src/Pure/ML/ml_lex.scala	Fri Nov 07 17:43:50 2014 +0100
+++ b/src/Pure/ML/ml_lex.scala	Fri Nov 07 19:47:05 2014 +0100
@@ -26,8 +26,8 @@
       "with", "withtype")
 
   val keywords2: Set[String] =
-    Set("case", "do", "else", "end", "if", "in", "let", "local", "of",
-      "sig", "struct", "then", "while", "with")
+    Set("and", "case", "do", "else", "end", "if", "in", "let", "local",
+      "of", "sig", "struct", "then", "while", "with")
 
   val keywords3: Set[String] =
     Set("handle", "open", "raise")