aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2017-11-08 13:52:15 +1300
committerTom Ryder <tom@sanctum.geek.nz>2017-11-08 13:52:15 +1300
commit5fa935ae49dd08f203c23ca04c545dc1fdc6eb69 (patch)
treeca323b430dbbcca42bc8e0e0f1971f33a5ad6fbc
parentf855ec0a7e76223d318ee4f0924d131643133e78 (diff)
parent6a5c86738c85296e0b8393dac7ce58285fa85149 (diff)
downloaddotfiles-5fa935ae49dd08f203c23ca04c545dc1fdc6eb69.tar.gz
Merge branch 'feature/vim-null-co...' into develop
* feature/vim-null-command: Use "nunmap" not "unmap" for b:undo_* var Remove null command from b:undo_* variables
-rw-r--r--vim/ftplugin/html.vim4
-rw-r--r--vim/ftplugin/perl.vim8
-rw-r--r--vim/ftplugin/sh.vim8
3 files changed, 10 insertions, 10 deletions
diff --git a/vim/ftplugin/html.vim b/vim/ftplugin/html.vim
index 27b38424..d2c6a3e3 100644
--- a/vim/ftplugin/html.vim
+++ b/vim/ftplugin/html.vim
@@ -30,7 +30,7 @@ nnoremap <buffer> <silent>
\ :<C-U>call <SID>UrlLink()<CR>
" Unload this filetype plugin
-let b:undo_user_ftplugin = ''
- \ . '|silent! nunmap <LocalLeader>c'
+let b:undo_user_ftplugin
+ \ = 'silent! nunmap <LocalLeader>c'
\ . '|silent! nunmap <LocalLeader>t'
\ . '|silent! nunmap <LocalLeader>r'
diff --git a/vim/ftplugin/perl.vim b/vim/ftplugin/perl.vim
index 7f6eb7fe..c18653d2 100644
--- a/vim/ftplugin/perl.vim
+++ b/vim/ftplugin/perl.vim
@@ -14,7 +14,7 @@ nnoremap <buffer> <silent>
\ :<C-U>%!perltidy<CR>
" Unload this filetype plugin
-let l:undo_user_ftplugin = ''
- \ . '|silent! unmap <LocalLeader>c'
- \ . '|silent! unmap <LocalLeader>l'
- \ . '|silent! unmap <LocalLeader>t'
+let l:undo_user_ftplugin
+ \ = 'silent! nunmap <LocalLeader>c'
+ \ . '|silent! nunmap <LocalLeader>l'
+ \ . '|silent! nunmap <LocalLeader>t'
diff --git a/vim/ftplugin/sh.vim b/vim/ftplugin/sh.vim
index a8c94445..60e8b6c4 100644
--- a/vim/ftplugin/sh.vim
+++ b/vim/ftplugin/sh.vim
@@ -46,8 +46,8 @@ nnoremap <buffer> <silent>
\ :<C-U>execute b:sh_lint<CR>
" Unload this filetype plugin
-let b:undo_user_ftplugin = ''
- \ . '|setlocal keywordprg<'
+let b:undo_user_ftplugin
+ \ = 'setlocal keywordprg<'
\ . '|unlet! b:sh_check b:sh_lint'
- \ . '|silent! unmap <LocalLeader>c'
- \ . '|silent! unmap <LocalLeader>l'
+ \ . '|silent! nunmap <LocalLeader>c'
+ \ . '|silent! nunmap <LocalLeader>l'