From d115ba06a04b0772246da35af8e9dad87933a0d1 Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Sat, 30 Jun 2018 00:51:23 +1200
Subject: Review vim/ftplugin and vim/indent files

---
 vim/ftplugin/markdown.vim | 30 +-----------------------------
 vim/ftplugin/php.vim      | 23 +----------------------
 2 files changed, 2 insertions(+), 51 deletions(-)

(limited to 'vim/ftplugin')

diff --git a/vim/ftplugin/markdown.vim b/vim/ftplugin/markdown.vim
index e1787df5..1e40c0ef 100644
--- a/vim/ftplugin/markdown.vim
+++ b/vim/ftplugin/markdown.vim
@@ -1,33 +1,5 @@
-"
-" Replace Vim's stock Markdown filetype plugin, reimplementing only the part I
-" actually need: the options settings. I don't use the folding, anyway.
-"
-" This is mostly because the stock file pulls in HTML's filetype plugins too,
-" without providing a variable check to stop it. That causes absurd problems
-" with defining HTML checkers/linters in the rest of my files.
-"
+" Block system ftplugin from loading to avoid HTML ftplugin load
 if exists('b:did_ftplugin') || &compatible
   finish
 endif
 let b:did_ftplugin = 1
-
-" Set comment/quote patterns
-setlocal comments=fb:*,fb:-,fb:+,n:>
-setlocal commentstring=>\ %s
-
-" Set format options
-setlocal formatoptions+=tcqln
-setlocal formatoptions-=ro
-
-" Set list format patterns
-if exists('+formatlistpat')
-  let &l:formatlistpat = '^\s*\d\+\.\s\+'
-        \ .'\|^[-*+]\s\+'
-        \ .'\|^\[^\ze[^\]]\+\]:'
-endif
-
-" Define how to undo this plugin's settings
-let b:undo_ftplugin = 'setlocal comments<'
-      \ . '|setlocal commentstring<'
-      \ . '|setlocal formatoptions<'
-      \ . '|setlocal formatlistpat<'
diff --git a/vim/ftplugin/php.vim b/vim/ftplugin/php.vim
index 35292e15..1e40c0ef 100644
--- a/vim/ftplugin/php.vim
+++ b/vim/ftplugin/php.vim
@@ -1,26 +1,5 @@
-"
-" Replace Vim's stock PHP filetype plugin, reimplementing only the part I
-" actually need: the matchit.vim keyword pairs.
-"
-" This is mostly because the stock file pulls in HTML's filetype plugins too,
-" without providing a variable check to stop it. That causes absurd problems
-" with defining HTML checkers/linters in the rest of my files.
-"
+" Block system ftplugin from loading to avoid HTML ftplugin load
 if exists('b:did_ftplugin') || &compatible
   finish
 endif
 let b:did_ftplugin = 1
-
-" 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\>'
-endif
-
-" Define how to undo this plugin's settings
-let b:undo_ftplugin = 'unlet b:match_words'
-- 
cgit v1.2.3