5 files changed, 24 insertions, 22 deletions
diff --git a/vim/after/ftplugin/php.vim b/vim/after/ftplugin/php.vim
index ee38ec3b..41fab89f 100644
--- a/vim/after/ftplugin/php.vim
+++ b/vim/after/ftplugin/php.vim
@@ -15,18 +15,6 @@ setlocal formatoptions+=or
 let b:undo_ftplugin = b:undo_ftplugin
       \ . '|setlocal comments< formatoptions<'
 
-" Define keywords for matchit.vim
-if exists('g:loaded_matchit')
-  let b:match_words = '<?php:?>'
-        \ . ',\<do\>:\<while\>'
-        \ . ',\<for\>:\<endfor\>'
-        \ . ',\<foreach\>:\<endforeach\>'
-        \ . ',\<if\>:\<elseif\>:\<else\>:\<endif\>'
-        \ . ',\<switch\>:\<endswitch\>'
-        \ . ',\<while\>:\<endwhile\>'
-  let b:undo_ftplugin = 'unlet b:match_words'
-endif
-
 " Stop here if the user doesn't want ftplugin mappings
 if exists('g:no_plugin_maps') || exists('g:no_php_maps')
   finish
diff --git a/vim/ftplugin/csv.vim b/vim/ftplugin/csv.vim
new file mode 100644
index 00000000..7242f766
--- /dev/null
+++ b/vim/ftplugin/csv.vim
@@ -0,0 +1,8 @@
+" Only do this when not yet done for this buffer
+if exists('b:did_ftplugin')
+  finish
+endif
+
+" No autoformatting for CSVs
+setlocal formatoptions=
+let b:undo_ftplugin = 'setlocal formatoptions<'
diff --git a/vim/ftplugin/password.vim b/vim/ftplugin/password.vim
new file mode 100644
index 00000000..a09bac47
--- /dev/null
+++ b/vim/ftplugin/password.vim
@@ -0,0 +1,8 @@
+" Only do this when not yet done for this buffer
+if exists('b:did_ftplugin')
+  finish
+endif
+
+" No autoformatting for password files
+setlocal formatoptions=
+let b:undo_ftplugin = 'setlocal formatoptions<'
diff --git a/vim/ftplugin/tsv.vim b/vim/ftplugin/tsv.vim
new file mode 100644
index 00000000..d98386a6
--- /dev/null
+++ b/vim/ftplugin/tsv.vim
@@ -0,0 +1,8 @@
+" Only do this when not yet done for this buffer
+if exists('b:did_ftplugin')
+  finish
+endif
+
+" No autoformatting for TSVs
+setlocal formatoptions=
+let b:undo_ftplugin = 'setlocal formatoptions<'
diff --git a/vim/indent/php.vim b/vim/indent/php.vim
deleted file mode 100644
index 7747d77e..00000000
--- a/vim/indent/php.vim
+++ /dev/null
@@ -1,10 +0,0 @@
-" Only do this when not done yet for this buffer
-if exists('b:did_indent')
-  finish
-endif
-let b:did_indent = 1
-
-" Replace Vim's stock PHP indent rules. They're very complicated and don't
-" work in a predictable way. Just use 'autoindent'.
-setlocal autoindent
-let b:undo_indent = 'setlocal autoindent<'