diff options
Diffstat (limited to 'vim/after/ftplugin/diff.vim')
-rw-r--r-- | vim/after/ftplugin/diff.vim | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/vim/after/ftplugin/diff.vim b/vim/after/ftplugin/diff.vim index f9f6c4b3..8c3d5b1d 100644 --- a/vim/after/ftplugin/diff.vim +++ b/vim/after/ftplugin/diff.vim @@ -4,24 +4,16 @@ if exists('no_plugin_maps') || exists('no_diff_maps') endif " Maps using autoloaded function for quoted block movement -nnoremap <buffer> <silent> <LocalLeader>[ +noremap <buffer> <silent> <LocalLeader>[ \ :<C-U>call diff#MoveBlock(v:count1, 1, 0)<CR> -nnoremap <buffer> <silent> <LocalLeader>] +sunmap <buffer> <LocalLeader>[ +noremap <buffer> <silent> <LocalLeader>] \ :<C-U>call diff#MoveBlock(v:count1, 0, 0)<CR> -onoremap <buffer> <silent> <LocalLeader>[ - \ :<C-U>call diff#MoveBlock(v:count1, 1, 0)<CR> -onoremap <buffer> <silent> <LocalLeader>] - \ :<C-U>call diff#MoveBlock(v:count1, 0, 0)<CR> -xnoremap <buffer> <silent> <LocalLeader>[ - \ :<C-U>call diff#MoveBlock(v:count1, 1, 1)<CR> -xnoremap <buffer> <silent> <LocalLeader>] - \ :<C-U>call diff#MoveBlock(v:count1, 0, 1)<CR> -let b:undo_ftplugin .= '|nunmap <buffer> <LocalLeader>[' - \ . '|nunmap <buffer> <LocalLeader>]' - \ . '|ounmap <buffer> <LocalLeader>[' - \ . '|ounmap <buffer> <LocalLeader>]' - \ . '|xunmap <buffer> <LocalLeader>[' - \ . '|xunmap <buffer> <LocalLeader>]' +sunmap <buffer> <LocalLeader>] +let b:undo_ftplugin .= '|smap <buffer> <LocalLeader>] <nop>' + \ . '|unmap <buffer> <LocalLeader>]' + \ . '|smap <buffer> <LocalLeader>] <nop>' + \ . '|unmap <buffer> <LocalLeader>]' " Set mappings for diff pruning plugin nmap <buffer> <LocalLeader>p |