From ad69b8aca286a9aa5f95f920199370e5512abcf7 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Fri, 29 Jun 2018 23:24:06 +1200 Subject: Use ftplugins for filetype mappings instead --- vim/after/ftplugin/vim/clear_maps.vim | 37 ----------------------------------- vim/after/ftplugin/vim/maps.vim | 37 +++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 37 deletions(-) delete mode 100644 vim/after/ftplugin/vim/clear_maps.vim create mode 100644 vim/after/ftplugin/vim/maps.vim (limited to 'vim/after/ftplugin/vim') diff --git a/vim/after/ftplugin/vim/clear_maps.vim b/vim/after/ftplugin/vim/clear_maps.vim deleted file mode 100644 index a84ca4b9..00000000 --- a/vim/after/ftplugin/vim/clear_maps.vim +++ /dev/null @@ -1,37 +0,0 @@ -" vim/clear_maps.vim: Fix clearing buffer-local vim maps that the core -" ftplugin leaves in place - -" Don't load if running compatible or too old -if &compatible || v:version < 700 - finish -endif - -" Don't load if already loaded -if exists('b:did_ftplugin_vim_lint') - finish -endif - -" Don't load if the mappings probably weren't loaded in the first place -if exists('g:no_plugin_maps') || exists('g:no_vim_maps') - finish -endif - -" Flag as loaded -let b:did_ftplugin_vim_clear_maps = 1 -let b:undo_ftplugin = b:undo_ftplugin - \ . '|unlet b:did_ftplugin_vim_clear_maps' - -" Add undo commands -let b:undo_ftplugin = b:undo_ftplugin - \ . '|silent! nunmap [[' - \ . '|silent! vunmap [[' - \ . '|silent! nunmap ]]' - \ . '|silent! vunmap ]]' - \ . '|silent! nunmap []' - \ . '|silent! vunmap []' - \ . '|silent! nunmap ][' - \ . '|silent! vunmap ][' - \ . '|silent! nunmap ]"' - \ . '|silent! vunmap ]"' - \ . '|silent! nunmap ["' - \ . '|silent! vunmap ["' diff --git a/vim/after/ftplugin/vim/maps.vim b/vim/after/ftplugin/vim/maps.vim new file mode 100644 index 00000000..7f2a07a0 --- /dev/null +++ b/vim/after/ftplugin/vim/maps.vim @@ -0,0 +1,37 @@ +" vim/maps.vim: tejr's mappings for 'vim' filetypes + +" Don't load if running compatible or too old +if &compatible || v:version < 700 + finish +endif + +" Don't load if already loaded +if exists('b:did_ftplugin_vim_maps') + finish +endif + +" Flag as loaded +let b:did_ftplugin_vim_maps = 1 +let b:undo_ftplugin = b:undo_ftplugin + \ . '|unlet b:did_ftplugin_vim_maps' + +" Set mappings +nmap l VimLint +let b:undo_ftplugin = b:undo_ftplugin + \ . '|nunmap l' + +" Add undo commands to fix clearing buffer-local vim maps that the core +" ftplugin leaves in place +let b:undo_ftplugin = b:undo_ftplugin + \ . '|silent! nunmap [[' + \ . '|silent! vunmap [[' + \ . '|silent! nunmap ]]' + \ . '|silent! vunmap ]]' + \ . '|silent! nunmap []' + \ . '|silent! vunmap []' + \ . '|silent! nunmap ][' + \ . '|silent! vunmap ][' + \ . '|silent! nunmap ]"' + \ . '|silent! vunmap ]"' + \ . '|silent! nunmap ["' + \ . '|silent! vunmap ["' -- cgit v1.2.3