From e084c69ff30472856a3a91ece6d8bc6ec99238a6 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Sat, 16 Jun 2018 20:41:46 +1200 Subject: Consistently require 'nocompatible' for ftplugins --- vim/ftplugin/markdown.vim | 14 +------------- vim/ftplugin/php.vim | 14 +------------- 2 files changed, 2 insertions(+), 26 deletions(-) (limited to 'vim/ftplugin') diff --git a/vim/ftplugin/markdown.vim b/vim/ftplugin/markdown.vim index 94f49c9b..c6a180a9 100644 --- a/vim/ftplugin/markdown.vim +++ b/vim/ftplugin/markdown.vim @@ -6,17 +6,11 @@ " without providing a variable check to stop it. That causes absurd problems " with defining HTML checkers/linters in the rest of my files. " -if exists('b:did_ftplugin') +if exists('b:did_ftplugin') || &compatible finish endif let b:did_ftplugin = 1 -" Support line continuation for this file -if &compatible - let s:cpoptions_save = &cpoptions - set cpoptions-=C -endif - " Set comment/quote patterns setlocal comments=fb:*,fb:-,fb:+,n:> setlocal commentstring=>\ %s @@ -37,9 +31,3 @@ let b:undo_ftplugin = 'setlocal comments<' \ . '|setlocal commentstring<' \ . '|setlocal formatoptions<' \ . '|setlocal formatlistpat<' - -" Restore 'cpoptions' setting if we touched it -if exists('s:cpoptions_save') - let &cpoptions = s:cpoptions_save - unlet s:cpoptions_save -endif diff --git a/vim/ftplugin/php.vim b/vim/ftplugin/php.vim index 39cec4b1..35292e15 100644 --- a/vim/ftplugin/php.vim +++ b/vim/ftplugin/php.vim @@ -6,17 +6,11 @@ " without providing a variable check to stop it. That causes absurd problems " with defining HTML checkers/linters in the rest of my files. " -if exists('b:did_ftplugin') +if exists('b:did_ftplugin') || &compatible finish endif let b:did_ftplugin = 1 -" Support line continuation for this file -if &compatible - let s:cpoptions_save = &cpoptions - set cpoptions-=C -endif - " Define keywords for matchit.vim if exists('g:loaded_matchit') let b:match_words = '' @@ -30,9 +24,3 @@ endif " Define how to undo this plugin's settings let b:undo_ftplugin = 'unlet b:match_words' - -" Restore 'cpoptions' setting if we touched it -if exists('s:cpoptions_save') - let &cpoptions = s:cpoptions_save - unlet s:cpoptions_save -endif -- cgit v1.2.3