12 files changed, 10 insertions, 74 deletions
diff --git a/vim/plugin/auto_backupdir.vim b/vim/plugin/auto_backupdir.vim
index f15e7ce6..d15c3150 100644
--- a/vim/plugin/auto_backupdir.vim
+++ b/vim/plugin/auto_backupdir.vim
@@ -5,8 +5,7 @@
 " Author: Tom Ryder <tom@sanctum.geek.nz>
 " License: Same as Vim itself
 "
-if exists('g:loaded_auto_backupdir')
-      \ || &compatible
+if exists('g:loaded_auto_backupdir') || &compatible
   finish
 endif
 let g:loaded_auto_backupdir = 1
diff --git a/vim/plugin/auto_swapdir.vim b/vim/plugin/auto_swapdir.vim
index ea41a0f0..b5f9ce3a 100644
--- a/vim/plugin/auto_swapdir.vim
+++ b/vim/plugin/auto_swapdir.vim
@@ -5,8 +5,7 @@
 " Author: Tom Ryder <tom@sanctum.geek.nz>
 " License: Same as Vim itself
 "
-if exists('g:loaded_auto_swapdir')
-      \ || &compatible
+if exists('g:loaded_auto_swapdir') || &compatible
   finish
 endif
 let g:loaded_auto_swapdir = 1
diff --git a/vim/plugin/auto_undodir.vim b/vim/plugin/auto_undodir.vim
index 1d20ba95..9a686fb1 100644
--- a/vim/plugin/auto_undodir.vim
+++ b/vim/plugin/auto_undodir.vim
@@ -5,9 +5,7 @@
 " Author: Tom Ryder <tom@sanctum.geek.nz>
 " License: Same as Vim itself
 "
-if exists('g:loaded_auto_undodir')
-      \ || !has('persistent_undo')
-      \ || &compatible
+if exists('g:loaded_auto_undodir') || &compatible || !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 cdced67d..cbbacc42 100644
--- a/vim/plugin/big_file_options.vim
+++ b/vim/plugin/big_file_options.vim
@@ -5,9 +5,7 @@
 " Author: Tom Ryder <tom@sanctum.geek.nz>
 " License: Same as Vim itself
 "
-if exists('g:loaded_big_file_options')
-      \ || !has('autocmd')
-      \ || &compatible
+if exists('g:loaded_big_file_options') || &compatible || !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 60245a30..afc04ed3 100644
--- a/vim/plugin/command_typos.vim
+++ b/vim/plugin/command_typos.vim
@@ -7,9 +7,7 @@
 " Author: Tom Ryder <tom@sanctum.geek.nz>
 " License: Same as Vim itself
 "
-if exists('g:loaded_command_typos')
-      \ || !has('user_commands')
-      \ || &compatible
+if exists('g:loaded_command_typos') || &compatible || !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 732acfea..158282bf 100644
--- a/vim/plugin/copy_linebreak.vim
+++ b/vim/plugin/copy_linebreak.vim
@@ -6,9 +6,7 @@
 " Author: Tom Ryder <tom@sanctum.geek.nz>
 " License: Same as Vim itself
 "
-if exists('g:loaded_copy_linebreak')
-      \ || !has('linebreak')
-      \ || &compatible
+if exists('g:loaded_copy_linebreak') || &compatible || !has('linebreak')
   finish
 endif
 let g:loaded_copy_linebreak = 1
diff --git a/vim/plugin/fixed_join.vim b/vim/plugin/fixed_join.vim
index 2c9e1d92..83977c2f 100644
--- a/vim/plugin/fixed_join.vim
+++ b/vim/plugin/fixed_join.vim
@@ -5,8 +5,7 @@
 " Author: Tom Ryder <tom@sanctum.geek.nz>
 " License: Same as Vim itself
 "
-if exists('g:loaded_fixed_join')
-      \ || &compatible
+if exists('g:loaded_fixed_join') || &compatible
   finish
 endif
 let g:loaded_fixed_join = 1
diff --git a/vim/plugin/mail_mutt.vim b/vim/plugin/mail_mutt.vim
index 9bb4abd4..24ce01dd 100644
--- a/vim/plugin/mail_mutt.vim
+++ b/vim/plugin/mail_mutt.vim
@@ -5,9 +5,7 @@
 " Author: Tom Ryder <tom@sanctum.geek.nz>
 " License: Same as Vim itself
 "
-if exists('g:loaded_mail_mutt')
-      \ || !has('user_commands')
-      \ || &compatible
+if exists('g:loaded_mail_mutt') || &compatible || !has('user_commands')
   finish
 endif
 let g:loaded_mail_mutt = 1
diff --git a/vim/plugin/strip_trailing_whitespace.vim b/vim/plugin/strip_trailing_whitespace.vim
index 1264a11f..1b6d2f38 100644
--- a/vim/plugin/strip_trailing_whitespace.vim
+++ b/vim/plugin/strip_trailing_whitespace.vim
@@ -5,8 +5,7 @@
 " Author: Tom Ryder <tom@sanctum.geek.nz>
 " License: Same as Vim itself
 "
-if exists('g:loaded_strip_trailing_whitespace')
-      \ || &compatible
+if exists('g:loaded_strip_trailing_whitespace') || &compatible
   finish
 endif
 let g:loaded_strip_trailing_whitespace = 1
diff --git a/vim/plugin/toggle_option_flag.vim b/vim/plugin/toggle_option_flag.vim
index dcc26cce..5c848368 100644
--- a/vim/plugin/toggle_option_flag.vim
+++ b/vim/plugin/toggle_option_flag.vim
@@ -5,9 +5,7 @@
 " Author: Tom Ryder <tom@sanctum.geek.nz>
 " License: Same as Vim itself
 "
-if exists('g:loaded_toggle_option_flag')
-      \ || !has('user_commands')
-      \ || &compatible
+if exists('g:loaded_toggle_option_flag') || &compatible || !has('user_commands')
   finish
 endif
 let g:loaded_toggle_option_flag = 1
diff --git a/vim/plugin/user_ftplugin.vim b/vim/plugin/user_ftplugin.vim
deleted file mode 100644
index d9739bda..00000000
--- a/vim/plugin/user_ftplugin.vim
+++ /dev/null
@@ -1,24 +0,0 @@
-"
-" user_ftplugin.vim: When switching filetypes, look for a b:undo_user_ftplugin
-" variable and use it in much the same way the core's ftplugin.vim does
-" b:undo_ftplugin in Vim >= 7.0. This allows you to undo your own ftplugin
-" files the same way you can the core ones.
-"
-if exists('g:loaded_user_ftplugin')
-      \ || !has('autocmd')
-      \ || &compatible
-  finish
-endif
-let g:loaded_user_ftplugin = 1
-
-function! s:LoadUserFtplugin()
-  if exists('b:undo_user_ftplugin')
-    execute b:undo_user_ftplugin
-    unlet b:undo_user_ftplugin
-  endif
-endfunction
-
-augroup user_ftplugin
-  autocmd!
-  autocmd FileType * call s:LoadUserFtplugin()
-augroup END
diff --git a/vim/plugin/user_indent.vim b/vim/plugin/user_indent.vim
deleted file mode 100644
index 01596bdb..00000000
--- a/vim/plugin/user_indent.vim
+++ /dev/null
@@ -1,24 +0,0 @@
-"
-" user_indent.vim: When switching filetypes, look for a b:undo_user_indent
-" variable and use it in much the same way the core's indent.vim does
-" b:undo_indent in Vim >= 7.0. This allows you to undo your own indent files
-" the same way you can the core ones.
-"
-if exists('g:loaded_user_indent')
-      \ || !has('autocmd')
-      \ || &compatible
-  finish
-endif
-let g:loaded_user_indent = 1
-
-function! s:LoadUserIndent()
-  if exists('b:undo_user_indent')
-    execute b:undo_user_indent
-    unlet b:undo_user_indent
-  endif
-endfunction
-
-augroup user_indent
-  autocmd!
-  autocmd FileType * call s:LoadUserIndent()
-augroup END