---

yaml
---
r: 60075
b: refs/heads/master
c: 80b2926
h: refs/heads/master
i:
  60073: f011c72
  60071: 54ecf1b
v: v3

Author: James Miller

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 0addefa68a85974a0b3906e7a46376a98ad513cc
+refs/heads/master: 80b2926357232f8674df2c1db24bb91f24628e2f
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 2d28d645422c1617be58c8ca7ad9a457264ca850
 refs/heads/try: c50a9d5b664478e533ba1d1d353213d70c8ad589

trunk/src/etc/vim/after/ftplugin/rust.vim

@@ -1,5 +1,5 @@
 "Highlight the 100th text column
 "Feature became available in v7.3
 if version >= 703
-    set colorcolumn=100
+    setlocal colorcolumn=100
 endif

trunk/src/etc/vim/after/syntax/rust.vim

@@ -1,4 +1,4 @@
-if exists('g:no_rust_conceal') || !has('conceal') || &enc != 'utf-8'
+if !exists('g:rust_conceal') || !has('conceal') || &enc != 'utf-8'
 	finish
 endif
 

trunk/src/etc/vim/syntax/rust.vim

@@ -29,7 +29,7 @@ syn match     rustIdentifier  contains=rustIdentifierPrime "\%([^[:cntrl:][:spac
 syn match     rustFuncName    "\%([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\%([^[:cntrl:][:punct:][:space:]]\|_\)*" display contained
 
 " Reserved words
-syn keyword   rustKeyword     m32 m64 m128 f80 f16 f128 be
+"syn keyword   rustKeyword     m32 m64 m128 f80 f16 f128 be " These are obsolete
 
 syn keyword   rustType        int uint float char bool u8 u16 u32 u64 f32
 syn keyword   rustType        f64 i8 i16 i32 i64 str Self