From 8d87620cf7d312ecd9cf0b74e4668e1bfe9aa492 Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Sun, 1 Jul 2018 23:58:19 +1200
Subject: Clear away stock vim ftplugin's buffer maps

---
 vim/after/ftplugin/vim.vim | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/vim/after/ftplugin/vim.vim b/vim/after/ftplugin/vim.vim
index 5fa9af61..5726e1e4 100644
--- a/vim/after/ftplugin/vim.vim
+++ b/vim/after/ftplugin/vim.vim
@@ -23,18 +23,16 @@ nnoremap <buffer> <LocalLeader>l
 let b:undo_ftplugin = b:undo_ftplugin
       \ . '|nunmap <buffer> <LocalLeader>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
-      \ . '|nunmap <buffer> [['
-      \ . '|vunmap <buffer> [['
-      \ . '|nunmap <buffer> ]]'
-      \ . '|vunmap <buffer> ]]'
-      \ . '|nunmap <buffer> []'
-      \ . '|vunmap <buffer> []'
-      \ . '|nunmap <buffer> ]['
-      \ . '|vunmap <buffer> ]['
-      \ . '|nunmap <buffer> ]"'
-      \ . '|vunmap <buffer> ]"'
-      \ . '|nunmap <buffer> ["'
-      \ . '|vunmap <buffer> ["'
+" Just get rid of the core ftplugin's square-bracket maps; I don't use them
+silent! nunmap <buffer> [[
+silent! vunmap <buffer> [[
+silent! nunmap <buffer> ]]
+silent! vunmap <buffer> ]]
+silent! nunmap <buffer> []
+silent! vunmap <buffer> []
+silent! nunmap <buffer> ][
+silent! vunmap <buffer> ][
+silent! nunmap <buffer> ]"
+silent! vunmap <buffer> ]"
+silent! nunmap <buffer> ["
+silent! vunmap <buffer> ["
-- 
cgit v1.2.3