aboutsummaryrefslogtreecommitdiff
path: root/vim/ftplugin
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2018-06-30 00:51:23 +1200
committerTom Ryder <tom@sanctum.geek.nz>2018-06-30 00:51:23 +1200
commitd115ba06a04b0772246da35af8e9dad87933a0d1 (patch)
tree9ef9586b95aef46781ae656372330de79cb3cb9c /vim/ftplugin
parent2bcce63572e062f34527fbe42bb0f5756a08d8b8 (diff)
downloaddotfiles-d115ba06a04b0772246da35af8e9dad87933a0d1.tar.gz
dotfiles-d115ba06a04b0772246da35af8e9dad87933a0d1.zip
Review vim/ftplugin and vim/indent files
Diffstat (limited to 'vim/ftplugin')
-rw-r--r--vim/ftplugin/markdown.vim30
-rw-r--r--vim/ftplugin/php.vim23
2 files changed, 2 insertions, 51 deletions
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'