about summary refs log tree commit diff
diff options
context:
space:
mode:
authorHuon Wilson <dbau.pp+github@gmail.com>2013-02-25 23:35:48 +1100
committerHuon Wilson <dbau.pp+github@gmail.com>2013-02-25 23:42:46 +1100
commit4bf94a7b30eeebd820a341890f05e5b709a6d2f2 (patch)
tree1032ba8cef0f1ebc35efb26dd755d074bbe0fcff
parentb26d434ad126c1ee35ca63c02ff3d9a243e3a00a (diff)
downloadrust-4bf94a7b30eeebd820a341890f05e5b709a6d2f2.tar.gz
rust-4bf94a7b30eeebd820a341890f05e5b709a6d2f2.zip
Emacs: Update emacs mode to be more similar to the vim mode.
Copy the keyword list, and add `self` so that it is somewhat highlighted
(being liberal with the correct categories).
-rw-r--r--src/etc/emacs/rust-mode.el23
1 files changed, 9 insertions, 14 deletions
diff --git a/src/etc/emacs/rust-mode.el b/src/etc/emacs/rust-mode.el
index 5fbd2ab67c2..5a6acbaddda 100644
--- a/src/etc/emacs/rust-mode.el
+++ b/src/etc/emacs/rust-mode.el
@@ -66,22 +66,17 @@
                     "trait" "struct" "fn" "enum"
                     "impl"))
       (puthash word 'def table))
-    (dolist (word '("again" "assert"
-                    "break"
-                    "copy"
-                    "do" "drop"
-                    "else" "export" "extern"
-                    "fail" "for"
-                    "if" "use"
-                    "let" "log" "loop"
-                    "move" "new"
-                    "pure" "pub" "priv"
-                    "ref" "return" "static"
-                    "unchecked" "unsafe"
-                    "while"))
+    (dolist (word '("as" "break"
+                    "copy" "do" "drop" "else"
+                    "extern" "for" "if" "let" "log"
+                    "loop" "once" "priv" "pub" "pure"
+                    "ref" "return" "static" "unsafe" "use"
+                    "while" "while"
+                    "assert"
+                    "mut"))
       (puthash word t table))
     (puthash "match" 'alt table)
-    (dolist (word '("true" "false")) (puthash word 'atom table))
+    (dolist (word '("self" "true" "false")) (puthash word 'atom table))
     table))
 ;; FIXME type-context keywords