Skip to content

Commit 80b2926

Browse files
author
James Miller
committed
General fixes for vim
Makes colorcolumn setlocal instead of set. Makes conceal opt-in. Removes the seem-to-be obsolete old keywords/types
1 parent 0addefa commit 80b2926

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
"Highlight the 100th text column
22
"Feature became available in v7.3
33
if version >= 703
4-
set colorcolumn=100
4+
setlocal colorcolumn=100
55
endif

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
if exists('g:no_rust_conceal') || !has('conceal') || &enc != 'utf-8'
1+
if !exists('g:rust_conceal') || !has('conceal') || &enc != 'utf-8'
22
finish
33
endif
44

src/etc/vim/syntax/rust.vim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ syn match rustIdentifier contains=rustIdentifierPrime "\%([^[:cntrl:][:spac
2929
syn match rustFuncName "\%([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\%([^[:cntrl:][:punct:][:space:]]\|_\)*" display contained
3030

3131
" Reserved words
32-
syn keyword rustKeyword m32 m64 m128 f80 f16 f128 be
32+
"syn keyword rustKeyword m32 m64 m128 f80 f16 f128 be " These are obsolete
3333

3434
syn keyword rustType int uint float char bool u8 u16 u32 u64 f32
3535
syn keyword rustType f64 i8 i16 i32 i64 str Self

0 commit comments

Comments
 (0)