From 317e4603dc9b930ab65ad8cdcddc1605642c8368 Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Sun, 8 Jul 2018 13:35:35 +1200
Subject: Restore Vim buffer mapping to unload script

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

(limited to 'vim/after/ftplugin/vim.vim')

diff --git a/vim/after/ftplugin/vim.vim b/vim/after/ftplugin/vim.vim
index 5726e1e4..6c04e1f4 100644
--- a/vim/after/ftplugin/vim.vim
+++ b/vim/after/ftplugin/vim.vim
@@ -23,16 +23,17 @@ nnoremap <buffer> <LocalLeader>l
 let b:undo_ftplugin = b:undo_ftplugin
       \ . '|nunmap <buffer> <LocalLeader>l'
 
-" 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> ["
+" Get rid of the core ftplugin's square-bracket maps on unload
+let b:undo_ftplugin = b:undo_ftplugin
+      \ . '|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


From 8333e1283e797d58f2cd7aa4226fc294851b16ad Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Sun, 8 Jul 2018 14:42:24 +1200
Subject: Remove error suppression on Vim unmaps

---
 vim/after/ftplugin/vim.vim | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'vim/after/ftplugin/vim.vim')

diff --git a/vim/after/ftplugin/vim.vim b/vim/after/ftplugin/vim.vim
index 6c04e1f4..9710b2d8 100644
--- a/vim/after/ftplugin/vim.vim
+++ b/vim/after/ftplugin/vim.vim
@@ -25,15 +25,15 @@ let b:undo_ftplugin = b:undo_ftplugin
 
 " Get rid of the core ftplugin's square-bracket maps on unload
 let b:undo_ftplugin = b:undo_ftplugin
-      \ . '|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> ["'
+      \ . '|nunmap <buffer> [['
+      \ . '|vunmap <buffer> [['
+      \ . '|nunmap <buffer> ]]'
+      \ . '|vunmap <buffer> ]]'
+      \ . '|nunmap <buffer> []'
+      \ . '|vunmap <buffer> []'
+      \ . '|nunmap <buffer> ]['
+      \ . '|vunmap <buffer> ]['
+      \ . '|nunmap <buffer> ]"'
+      \ . '|vunmap <buffer> ]"'
+      \ . '|nunmap <buffer> ["'
+      \ . '|vunmap <buffer> ["'
-- 
cgit v1.2.3