Merge branch 'master' of git://github.com/slavapestov/factor

diff --git a/misc/fuel/fuel-syntax.el b/misc/fuel/fuel-syntax.el
index 026a7738e0b95d58279bf774365308db81068dda..c6638915b7aa18ce7d1ac4f5f9ff5eb9aa9970de 100644 (file)
--- a/misc/fuel/fuel-syntax.el
+++ b/misc/fuel/fuel-syntax.el
@@ -1,3 +1,4 @@
+\r
 ;;; fuel-syntax.el --- auxiliar definitions for factor code navigation.\r
 \r
 ;; Copyright (C) 2008, 2009  Jose Antonio Ortega Ruiz\r
@@ -46,7 +47,7 @@
   '(":" "::" ";" "&:" "<<" "<PRIVATE" ">>"\r
     "ABOUT:" "AFTER:" "ALIAS:" "ALIEN:" "ARTICLE:"\r
     "B" "BEFORE:" "BIN:"\r
-    "C:" "CALLBACK:" "C-ENUM:" "C-STRUCT:" "C-TYPE:" "C-UNION:" "CHAR:" "COM-INTERFACE:" "CONSTANT:" "call-next-method"\r
+    "C:" "CALLBACK:" "C-ENUM:" "C-TYPE:" "CHAR:" "COM-INTERFACE:" "CONSTANT:" "CONSULT:" "call-next-method"\r
     "DEFER:"\r
     "EBNF:" ";EBNF" "ERROR:" "EXCLUDE:"\r
     "f" "FORGET:" "FROM:" "FUNCTION:"\r
@@ -59,7 +60,7 @@
     "MEMO:" "MEMO:" "METHOD:" "MIXIN:"\r
     "NAN:"\r
     "OCT:"\r
-    "POSTPONE:" "PREDICATE:" "PRIMITIVE:" "PRIVATE>" "PROVIDE:"\r
+    "POSTPONE:" "PREDICATE:" "PRIMITIVE:" "PRIVATE>" "PROTOCOL:" "PROVIDE:"\r
     "QUALIFIED-WITH:" "QUALIFIED:"\r
     "read-only" "RENAME:" "REQUIRE:"  "REQUIRES:"\r
     "SINGLETON:" "SINGLETONS:" "SLOT:" "SPECIALIZED-ARRAY:" "SPECIALIZED-ARRAYS:" "STRING:" "STRUCT:" "SYMBOL:" "SYMBOLS:" "SYNTAX:"\r
@@ -164,13 +165,13 @@
 \r
 (defconst fuel-syntax--indent-def-starts '("" ":"\r
                                            "AFTER" "BEFORE"\r
-                                           "C-ENUM" "C-STRUCT" "C-UNION" "COM-INTERFACE"\r
+                                           "C-ENUM" "COM-INTERFACE" "CONSULT"\r
                                            "FROM" "FUNCTION:"\r
                                            "INTERSECTION:"\r
                                            "M" "M:" "MACRO" "MACRO:"\r
                                            "MEMO" "MEMO:" "METHOD"\r
                                            "SYNTAX"\r
-                                           "PREDICATE" "PRIMITIVE"\r
+                                           "PREDICATE" "PRIMITIVE" "PROTOCOL"\r
                                            "SINGLETONS"\r
                                            "STRUCT" "SYMBOLS" "TAG" "TUPLE"\r
                                            "TYPED" "TYPED:"\r