diff options
| author | Adam Stankiewicz <sheerun@sher.pl> | 2013-11-11 01:34:19 +0100 |
|---|---|---|
| committer | Adam Stankiewicz <sheerun@sher.pl> | 2013-11-11 01:34:19 +0100 |
| commit | 8a255002df1f6d02ef7ca9503be1a7d7234acef8 (patch) | |
| tree | ccc7fe328d34152349bb5e4b77f0a42338c95783 | |
| parent | b2d556d384e13d3180013ef8161936a4c3b990cd (diff) | |
| download | vim-polyglot-8a255002df1f6d02ef7ca9503be1a7d7234acef8.tar.gz vim-polyglot-8a255002df1f6d02ef7ca9503be1a7d7234acef8.zip | |
Update csv and rust
| -rw-r--r-- | ftplugin/csv.vim | 17 | ||||
| -rw-r--r-- | syntax/rust.vim | 4 |
2 files changed, 13 insertions, 8 deletions
diff --git a/ftplugin/csv.vim b/ftplugin/csv.vim index 992b86a7..1ba27722 100644 --- a/ftplugin/csv.vim +++ b/ftplugin/csv.vim @@ -1766,8 +1766,7 @@ fu! <sid>MoveOver(outer) "{{{3 let mode = 1 endif endif - " Use the mapped key - exe ":sil! norm E" + call <sid>MoveCol(-1, line(".")) let _s = @/ if last exe "sil! norm! /" . b:col . "\<cr>v$h" . (mode ? "" : "\<Left>") @@ -1779,11 +1778,19 @@ endfu fu! <sid>CSVMappings() "{{{3 call <sid>Map('noremap', 'W', ':<C-U>call <SID>MoveCol(1, line("."))<CR>') + call <sid>Map('noremap', '<C-Right>', ':<C-U>call <SID>MoveCol(1, line("."))<CR>') + call <sid>Map('noremap', 'L', ':<C-U>call <SID>MoveCol(1, line("."))<CR>') call <sid>Map('noremap', 'E', ':<C-U>call <SID>MoveCol(-1, line("."))<CR>') + call <sid>Map('noremap', '<C-Left>', ':<C-U>call <SID>MoveCol(-1, line("."))<CR>') + call <sid>Map('noremap', 'H', ':<C-U>call <SID>MoveCol(-1, line("."))<CR>') call <sid>Map('noremap', 'K', ':<C-U>call <SID>MoveCol(0, \ line(".")-v:count1)<CR>') + call <sid>Map('noremap', '<Up>', ':<C-U>call <SID>MoveCol(0, + \ line(".")-v:count1)<CR>') call <sid>Map('noremap', 'J', ':<C-U>call <SID>MoveCol(0, \ line(".")+v:count1)<CR>') + call <sid>Map('noremap', '<Down>', ':<C-U>call <SID>MoveCol(0, + \ line(".")+v:count1)<CR>') call <sid>Map('nnoremap', '<CR>', ':<C-U>call <SID>PrepareFolding(1, \ 1)<CR>') call <sid>Map('nnoremap', '<Space>', ':<C-U>call <SID>PrepareFolding(1, @@ -1806,12 +1813,6 @@ fu! <sid>CSVMappings() "{{{3 call <sid>Map('nnoremap', '<LocalLeader><CR>', '<CR>') call <sid>Map('nnoremap', '<LocalLeader><Space>', '<Space>') call <sid>Map('nnoremap', '<LocalLeader><BS>', '<BS>') - call <sid>Map('map', '<C-Right>', 'W') - call <sid>Map('map', '<C-Left>', 'E') - call <sid>Map('map', 'H', 'E') - call <sid>Map('map', 'L', 'W') - call <sid>Map('map', '<Up>', 'K') - call <sid>Map('map', '<Down>', 'J') endfu fu! <sid>CommandDefinitions() "{{{3 diff --git a/syntax/rust.vim b/syntax/rust.vim index a0a23928..e5ff089e 100644 --- a/syntax/rust.vim +++ b/syntax/rust.vim @@ -161,6 +161,9 @@ syn match rustNumber display "\<[0-9][0-9_]*\(i\|i8\|i16\|i32\|i64\)\>" syn match rustHexNumber display "\<0x[a-fA-F0-9_]\+\>" syn match rustHexNumber display "\<0x[a-fA-F0-9_]\+\(u\|u8\|u16\|u32\|u64\)\>" syn match rustHexNumber display "\<0x[a-fA-F0-9_]\+\(i8\|i16\|i32\|i64\)\>" +syn match rustOctNumber display "\<0o[0-7_]\+\>" +syn match rustOctNumber display "\<0o[0-7_]\+\(u\|u8\|u16\|u32\|u64\)\>" +syn match rustOctNumber display "\<0o[0-7_]\+\(i8\|i16\|i32\|i64\)\>" syn match rustBinNumber display "\<0b[01_]\+\>" syn match rustBinNumber display "\<0b[01_]\+\(u\|u8\|u16\|u32\|u64\)\>" syn match rustBinNumber display "\<0b[01_]\+\(i8\|i16\|i32\|i64\)\>" @@ -198,6 +201,7 @@ syn region rustFoldBraces start="{" end="}" transparent fold " Default highlighting {{{1 hi def link rustHexNumber rustNumber +hi def link rustOctNumber rustNumber hi def link rustBinNumber rustNumber hi def link rustIdentifierPrime rustIdentifier hi def link rustTrait rustType |