about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-11-11 18:26:56 +0000
committerbors <bors@rust-lang.org>2014-11-11 18:26:56 +0000
commit351f7afd06d2164b5bfe2467333c355a20fcb02d (patch)
tree3d525e46f6d747f01a3665a911b9aad72b8c2ef8
parent8f8753878644b0bfb38d24781edb9ef2028730f2 (diff)
parent27774e8e24fe66b6463ca1916eeea1626c663e77 (diff)
downloadrust-351f7afd06d2164b5bfe2467333c355a20fcb02d.tar.gz
rust-351f7afd06d2164b5bfe2467333c355a20fcb02d.zip
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.
-rw-r--r--src/etc/emacs/rust-mode.el2
-rw-r--r--src/etc/kate/rust.xml1
2 files changed, 2 insertions, 1 deletions
diff --git a/src/etc/emacs/rust-mode.el b/src/etc/emacs/rust-mode.el
index 6a514c81b09..df14af4c887 100644
--- 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
index 89bb6eb169f..c22cd9c2047 100644
--- 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>