From 61d05839a42b56c0759264b493f98d5a516affc4 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Tue, 7 Nov 2017 13:38:10 +1300 Subject: 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. --- vim/ftplugin/mail.vim | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'vim/ftplugin/mail.vim') diff --git a/vim/ftplugin/mail.vim b/vim/ftplugin/mail.vim index 236f25ff..d4840bfd 100644 --- a/vim/ftplugin/mail.vim +++ b/vim/ftplugin/mail.vim @@ -1,9 +1,4 @@ " Use trailing whitespace to denote continued paragraph setlocal formatoptions+=w - -" Undo -if !exists('b:undo_ftplugin') - let b:undo_ftplugin = '' -endif -let b:undo_ftplugin = b:undo_ftplugin - \ . '|setlocal formatoptions<' +let b:undo_user_ftplugin + \ = 'setlocal formatoptions<' -- cgit v1.2.3