From 03919f1c03f89e17c90e398a7eaceabb21f1268c Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Sun, 12 Nov 2017 23:58:43 +1300 Subject: Separate g:loaded/&cp tests from feat tests Keeping the tests at the beginning of plugins on one line without continuations is needed to work around &cpo-=C. --- vim/plugin/auto_undodir.vim | 5 ++++- vim/plugin/big_file_options.vim | 5 ++++- vim/plugin/command_typos.vim | 5 ++++- vim/plugin/copy_linebreak.vim | 5 ++++- vim/plugin/mail_mutt.vim | 5 ++++- vim/plugin/toggle_option_flag.vim | 5 ++++- 6 files changed, 24 insertions(+), 6 deletions(-) diff --git a/vim/plugin/auto_undodir.vim b/vim/plugin/auto_undodir.vim index 9a686fb1..cf8d896a 100644 --- a/vim/plugin/auto_undodir.vim +++ b/vim/plugin/auto_undodir.vim @@ -5,7 +5,10 @@ " Author: Tom Ryder " License: Same as Vim itself " -if exists('g:loaded_auto_undodir') || &compatible || !has('persistent_undo') +if exists('g:loaded_auto_undodir') || &compatible + finish +endif +if !has('persistent_undo') finish endif let g:loaded_auto_undodir = 1 diff --git a/vim/plugin/big_file_options.vim b/vim/plugin/big_file_options.vim index cbbacc42..f7fa0281 100644 --- a/vim/plugin/big_file_options.vim +++ b/vim/plugin/big_file_options.vim @@ -5,7 +5,10 @@ " Author: Tom Ryder " License: Same as Vim itself " -if exists('g:loaded_big_file_options') || &compatible || !has('autocmd') +if exists('g:loaded_big_file_options') || &compatible + finish +endif +if !has('autocmd') finish endif let g:loaded_big_file_options = 1 diff --git a/vim/plugin/command_typos.vim b/vim/plugin/command_typos.vim index afc04ed3..6f34c680 100644 --- a/vim/plugin/command_typos.vim +++ b/vim/plugin/command_typos.vim @@ -7,7 +7,10 @@ " Author: Tom Ryder " License: Same as Vim itself " -if exists('g:loaded_command_typos') || &compatible || !has('user_commands') +if exists('g:loaded_command_typos') || &compatible + finish +endif +if !has('user_commands') finish endif let g:loaded_command_typos = 1 diff --git a/vim/plugin/copy_linebreak.vim b/vim/plugin/copy_linebreak.vim index 158282bf..9d241d5a 100644 --- a/vim/plugin/copy_linebreak.vim +++ b/vim/plugin/copy_linebreak.vim @@ -6,7 +6,10 @@ " Author: Tom Ryder " License: Same as Vim itself " -if exists('g:loaded_copy_linebreak') || &compatible || !has('linebreak') +if exists('g:loaded_copy_linebreak') || &compatible + finish +endif +if !has('linebreak') finish endif let g:loaded_copy_linebreak = 1 diff --git a/vim/plugin/mail_mutt.vim b/vim/plugin/mail_mutt.vim index 13389309..5170fb52 100644 --- a/vim/plugin/mail_mutt.vim +++ b/vim/plugin/mail_mutt.vim @@ -5,7 +5,10 @@ " Author: Tom Ryder " License: Same as Vim itself " -if exists('g:loaded_mail_mutt') || &compatible || !has('user_commands') +if exists('g:loaded_mail_mutt') || &compatible + finish +endif +if !has('user_commands') finish endif let g:loaded_mail_mutt = 1 diff --git a/vim/plugin/toggle_option_flag.vim b/vim/plugin/toggle_option_flag.vim index 5c848368..bc7ccd78 100644 --- a/vim/plugin/toggle_option_flag.vim +++ b/vim/plugin/toggle_option_flag.vim @@ -5,7 +5,10 @@ " Author: Tom Ryder " License: Same as Vim itself " -if exists('g:loaded_toggle_option_flag') || &compatible || !has('user_commands') +if exists('g:loaded_toggle_option_flag') || &compatible + finish +endif +if !has('user_commands') finish endif let g:loaded_toggle_option_flag = 1 -- cgit v1.2.3