aboutsummaryrefslogtreecommitdiff
path: root/vim/vimrc
diff options
context:
space:
mode:
Diffstat (limited to 'vim/vimrc')
-rw-r--r--vim/vimrc7
1 files changed, 5 insertions, 2 deletions
diff --git a/vim/vimrc b/vim/vimrc
index a6a3beae..86f13359 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -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