auto merge of #18793 : swgillespie/rust/master, r=alexcrichton

I noticed today that `move` wasn't getting highlighted in my editor of choice (emacs), so I went ahead and added it as a keyword in the emacs, vim, and kate editor files. Apparently it has already been done for gedit.
rust-lang · Nov 11, 2014 · 351f7af · 351f7af
2 parents 8f87538 + 27774e8
commit 351f7af
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/etc/emacs/rust-mode.el b/src/etc/emacs/rust-mode.el
@@ -176,7 +176,7 @@
     "false" "fn" "for"
     "if" "impl" "in"
     "let" "loop"
-    "match" "mod" "mut"
+    "match" "mod" "move" "mut"
     "priv" "proc" "pub"
     "ref" "return"
     "self" "static" "struct" "super"

diff --git a/src/etc/kate/rust.xml b/src/etc/kate/rust.xml
@@ -34,6 +34,7 @@
 		<item> loop </item>
 		<item> match </item>
 		<item> mod </item>
+		<item> move </item>
 		<item> mut </item>
 		<item> priv </item>
 		<item> pub </item>