]> gitweb.factorcode.org Git - factor.git/commitdiff
FUEL: font-lock errors the same as tuples -- it looks much better
authorBjörn Lindqvist <bjourne@gmail.com>
Mon, 13 Jul 2015 00:18:53 +0000 (02:18 +0200)
committerJohn Benediktsson <mrjbq7@gmail.com>
Wed, 15 Jul 2015 00:29:43 +0000 (17:29 -0700)
misc/fuel/factor-mode.el

index 74b313deda84ed9526426cbebab944a1281349b2..73a45a2c169bab6887fd1e20bdab90dbf4f0c768 100644 (file)
@@ -95,11 +95,6 @@ these lines in your .emacs:
   :group 'factor-faces
   :group 'faces)
 
-(defface factor-font-lock-error-form '((t (:inherit font-lock-warning-face)))
-  "ERROR: ... ; form"
-  :group 'factor-faces
-  :group 'faces)
-
 (defface factor-font-lock-parsing-word '((t (:inherit font-lock-keyword-face)))
   "parsing words"
   :group 'factor-faces
@@ -330,9 +325,6 @@ these lines in your .emacs:
    '("C-STRUCT" "C-UNION" "COM-INTERFACE" "MIXIN" "SINGLETON"
      "SPECIALIZED-ARRAY" "STRUCT" "UNION-STRUCT")))
 
-(defconst factor-error-regex
-  (factor-second-word-regex '("ERROR")))
-
 (defconst factor-constructor-regex
   "<[^ >]+>")
 
@@ -496,7 +488,6 @@ these lines in your .emacs:
     (,factor-float-regex . 'factor-font-lock-number)
     (,factor-ratio-regex . 'factor-font-lock-ratio)
     (,factor-type-definition-regex 2 'factor-font-lock-type-name)
-    (,factor-error-regex 2 'factor-font-lock-error-form)
     (,factor-method-definition-regex (1 'factor-font-lock-type-name)
                                      (2 'factor-font-lock-word))
     (,factor-before-definition-regex (1 'factor-font-lock-type-name)
@@ -515,6 +506,7 @@ these lines in your .emacs:
        "\\(%s:\\)[ \n]+%s\\(?:[ \n]+\\(<\\)[ \n]+%s\\)?"
        (regexp-opt '("BUILTIN"
                      "ENUM"
+                     "ERROR"
                      "PROTOCOL"
                      "STRUCT"
                      "TUPLE"