comparison src/elisp/urweb-mode.el @ 2206:c1a62ce47083

Merge.
author Ziv Scully <ziv@mit.edu>
date Tue, 27 May 2014 21:38:01 -0400
parents 403f0cc65b9c
children 3dc020fb2aa1
comparison
equal deleted inserted replaced
2205:cdea39473c78 2206:c1a62ce47083
137 "datatype" "else" "end" "extern" "fn" "map" 137 "datatype" "else" "end" "extern" "fn" "map"
138 "fun" "functor" "if" "include" 138 "fun" "functor" "if" "include"
139 "of" "open" "let" "in" 139 "of" "open" "let" "in"
140 "rec" "sequence" "sig" "signature" "cookie" "style" "task" "policy" 140 "rec" "sequence" "sig" "signature" "cookie" "style" "task" "policy"
141 "struct" "structure" "table" "view" "then" "type" "val" "where" 141 "struct" "structure" "table" "view" "then" "type" "val" "where"
142 "with" 142 "with" "ffi"
143 143
144 "Name" "Type" "Unit") 144 "Name" "Type" "Unit")
145 "A regexp that matches any non-SQL keywords of Ur/Web.") 145 "A regexp that matches any non-SQL keywords of Ur/Web.")
146 146
147 (defconst urweb-sql-keywords-regexp 147 (defconst urweb-sql-keywords-regexp