auto merge of #10968 : MicahChalmer/rust/emacs-proc-keyword, r=metajack

bors · bors · commit 8f6df87c1d87 · 2013-12-14T19:41:42.000-08:00
diff --git a/src/etc/emacs/rust-mode.el b/src/etc/emacs/rust-mode.el
@@ -134,7 +134,7 @@
     "if" "impl" "in"
     "let" "loop"
     "match" "mod" "mut"
-    "priv" "pub"
+    "priv" "proc" "pub"
     "ref" "return"
     "self" "static" "struct" "super"
     "true" "trait" "type"
