diff options
author | Tom Ryder <tom@sanctum.geek.nz> | 2018-06-17 01:01:12 +1200 |
---|---|---|
committer | Tom Ryder <tom@sanctum.geek.nz> | 2018-06-17 01:01:12 +1200 |
commit | 37ae33b03cb8f7a0ea591c56fae48c5bcb588704 (patch) | |
tree | 2ddd07cd9dd348fa4f251d4b83960e24cf75d30f /vim/ftplugin/php.vim | |
parent | Merge branch 'release/v0.53.0' (diff) | |
parent | Regenerate dotfiles(7) manual (diff) | |
download | dotfiles-37ae33b03cb8f7a0ea591c56fae48c5bcb588704.tar.gz dotfiles-37ae33b03cb8f7a0ea591c56fae48c5bcb588704.zip |
Merge branch 'release/v0.54.0'v0.54.0
* release/v0.54.0:
Regenerate dotfiles(7) manual
Bump VERSION
Add note about compiler scripts
Arrange for tidiers to hold window position
Update markdown_autoformat.vim
Update surround.vim
Completely overhaul after/ftplugin files
Use short-circuit for no-mapping check
Correct g:current_compiler setting
Consistently require 'nocompatible' for ftplugins
Upgrade insert_suspend_hlsearch.vim
Use `function!` consistently in ftplugins
Fix comments in vim/filetype.vim
Set 'comments' blank by default
Add Xresources filenames
Add more names to Vim Bash types
Diffstat (limited to 'vim/ftplugin/php.vim')
-rw-r--r-- | vim/ftplugin/php.vim | 14 |
1 files changed, 1 insertions, 13 deletions
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 = '<?php:?>' @@ -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 |