From bcad40034e1e472f18adcfec48998d114d3618be Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Fri, 7 Jun 2019 01:11:16 +1200
Subject: Use shorter :map commands for diff/mail para nav

---
 vim/after/ftplugin/diff.vim | 24 ++++++++----------------
 vim/after/ftplugin/mail.vim | 24 ++++++++----------------
 2 files changed, 16 insertions(+), 32 deletions(-)

(limited to 'vim/after')

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
diff --git a/vim/after/ftplugin/mail.vim b/vim/after/ftplugin/mail.vim
index cfb738a1..85b7affd 100644
--- a/vim/after/ftplugin/mail.vim
+++ b/vim/after/ftplugin/mail.vim
@@ -114,21 +114,13 @@ let b:undo_ftplugin .= '|nunmap <buffer> <LocalLeader>Q'
       \ . '|xunmap <buffer> <LocalLeader>Q'
 
 " Maps using autoloaded function for quoted paragraph movement
-nnoremap <buffer> <silent> <LocalLeader>[
+noremap <buffer> <silent> <LocalLeader>[
       \ :<C-U>call mail#NewBlank(v:count1, 1, 0)<CR>
-nnoremap <buffer> <silent> <LocalLeader>]
+sunmap <buffer> <LocalLeader>[
+noremap <buffer> <silent> <LocalLeader>]
       \ :<C-U>call mail#NewBlank(v:count1, 0, 0)<CR>
-onoremap <buffer> <silent> <LocalLeader>[
-      \ :<C-U>call mail#NewBlank(v:count1, 1, 0)<CR>
-onoremap <buffer> <silent> <LocalLeader>]
-      \ :<C-U>call mail#NewBlank(v:count1, 0, 0)<CR>
-xnoremap <buffer> <silent> <LocalLeader>[
-      \ :<C-U>call mail#NewBlank(v:count1, 1, 1)<CR>
-xnoremap <buffer> <silent> <LocalLeader>]
-      \ :<C-U>call mail#NewBlank(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>]'
-- 
cgit v1.2.3