From: Anders Mörtberg <andersmortberg@gmail.com>
Date: Thu, 7 Jul 2016 10:34:12 +0000 (+0200)
Subject: Merge branch 'csystems'
X-Git-Url: https://git.ak3n.com/?a=commitdiff_plain;h=d067f108a9c85abcb577e71b6c6bea3f8fa133ba;p=cubicaltt.git

Merge branch 'csystems'

# Conflicts:
#	cubicaltt.el
#	examples/helix.ctt
---

d067f108a9c85abcb577e71b6c6bea3f8fa133ba
diff --cc cubicaltt.el
index 0facab0,c45a39f..23923fe
--- a/cubicaltt.el
+++ b/cubicaltt.el
@@@ -1,6 -1,6 +1,6 @@@
  ;; define several class of keywords
  (setq ctt-keywords '("hdata" "data" "import" "mutual" "let" "in" "split"
-                      "with" "module" "where" "U") )
 -                     "module" "where" "U" "opaque" "visible") )
++                     "with" "module" "where" "U" "opaque" "visible") )
  (setq ctt-special '("undefined" "primitive"))
  
  ;; create regex strings