diff options
| author | Tom Ryder <tom@sanctum.geek.nz> | 2018-06-25 14:01:59 +1200 |
|---|---|---|
| committer | Tom Ryder <tom@sanctum.geek.nz> | 2018-06-25 14:01:59 +1200 |
| commit | 4195ce53f3454c1ed5b85bd29fa75af84d3c455f (patch) | |
| tree | 94461e8de93db0da5557fff3638278fb759043d6 /vim/vimrc | |
| parent | Merge branch 'release/v1.2.0' (diff) | |
| parent | Bump VERSION (diff) | |
| download | dotfiles-4195ce53f3454c1ed5b85bd29fa75af84d3c455f.tar.gz dotfiles-4195ce53f3454c1ed5b85bd29fa75af84d3c455f.zip | |
Merge branch 'release/v1.3.0'v1.3.0
* release/v1.3.0:
Bump VERSION
Clear local leader maps on filetype change
Upgrade fixed_join.vim, define map explicitly
Remove misguided buffer mapping clear
Diffstat (limited to 'vim/vimrc')
| -rw-r--r-- | vim/vimrc | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -200,6 +200,9 @@ nnoremap ]t :<C-U>tabnext<CR> nmap [<Space> <Plug>PutBlankLinesAbove nmap ]<Space> <Plug>PutBlankLinesBelow +" Remap normal J to hold the cursor still while joining lines +nmap J <Plug>FixedJoin + " Remap normal Y to yank to end of line (consistent with C, D) nnoremap Y y$ @@ -277,8 +280,8 @@ if has('autocmd') && v:version >= 700 augroup vimrc_filetype_mappings autocmd! - " Clear away existing local mappings - autocmd FileType * mapclear <buffer> + " Clear existing local leader maps + autocmd FileType * call vimrc#ClearLocalLeaderMaps() " Diff: prune sections autocmd FileType diff nmap <buffer> _p <Plug>DiffPrune |