|author||Tom Ryder <email@example.com>||2017-11-07 13:38:10 +1300|
|committer||Tom Ryder <firstname.lastname@example.org>||2017-11-07 13:38:10 +1300|
Add user_ftplugin.vim and user_indent.vim plugins
This reverts commit 09b83b6 and replaces it with a working version. Because of the order in which the autocmd hooks run, the attempted method of adding unloading instructions for my custom ftplugin and indent rules to the b:undo_ftplugin and b:undo_indent doesn't actually work. This is because the custom rules for both groups from ~/.vim are sourced *first*, before their core versions, so the changes the custom rules made to b:undo_ftplugin and b:undo_indent are simply clobbered by the core version when it loads itself. Therefore we need to arrange for two things: 1. A custom variable needs to be checked and executed when the filetype changes to revert the changes for the custom ftplugin or indent rules. 2. That execution needs to take place *first* when the filetype changes. I wrote two simple plugins with very similar code that are designed to run as a user's custom ftplugin.vim and indent.vim implementations, running before their brethren in the Vim core, and setting up an autocmd hook to :execute b:undo_user_ftplugin and b:undo_user_indent plugin respectively. This seemed to work well, so I've implemented it. It involves adding a shim to ~/.vim/indent.vim and ~/.vim/ftplugin.vim to "preload" the plugin when the `filetype indent plugin on` call is made. I've added that to the relevant Makefile targets.
Diffstat (limited to 'vim/ftplugin/sh.vim')
1 files changed, 2 insertions, 7 deletions
diff --git a/vim/ftplugin/sh.vim b/vim/ftplugin/sh.vim
index 85251aa1..21d494e3 100644
@@ -23,6 +23,8 @@ endif
" Use han(1df) as a man(1) wrapper for Bash files if available
if exists('b:is_bash') && executable('han')
+ let b:undo_user_indent
+ \ = 'setlocal keywordprg<'
" Map checker based on shell family
@@ -48,10 +50,3 @@ endif
nnoremap <buffer> <silent>
\ :<C-U>execute b:lint<CR>
- let b:undo_ftplugin = ''
-let b:undo_ftplugin = b:undo_ftplugin
- \ . '|setlocal keywordprg<'