Merge branch 'release/v1.26.0'v1.26.0

* release/v1.26.0:
  Bump VERSION
  Upgrade insert_cancel.vim again
  Check for +conceal before setting 'conceallevel'
  Upgrade insert_cancel.vim
  Remove session_lazy.vim
  Add missing dot to mutt filetype.vim path
  Add session_lazy.vim plugin
  Add 'sessionoptions' settings
  Correct login around ftplugin/make.vim mappings
  Move after/ftplugin/sed.vim to ftplugin/sed.vim
  Clean up existing ftplugins a bit
  Overhaul after/ftplugin
  Add explicit group to ftdetect rule
  Move angle-bracket matchpairs to Perl filetype

1 files changed, 5 insertions, 10 deletions

diff --git a/vim/after/ftplugin/php.vim b/vim/after/ftplugin/php.vim
index 765c1fb9..c98c1264 100644
--- a/vim/after/ftplugin/php.vim
+++ b/vim/after/ftplugin/php.vim
@@ -1,21 +1,17 @@
 " Extra configuration for PHP scripts
-if &filetype != 'php' || &compatible || v:version < 700
+if &filetype !=# 'php' || v:version < 700 || &compatible
   finish
 endif
 
 " Use PHP itself for syntax checking
 compiler php
-let b:undo_ftplugin = b:undo_ftplugin
-      \ . '|unlet b:current_compiler'
-      \ . '|setlocal errorformat<'
-      \ . '|setlocal makeprg<'
+let b:undo_ftplugin .= '|unlet b:current_compiler'
+      \ . '|setlocal errorformat< makeprg<'
 
 " Set comment formats
 setlocal comments=s1:/*,m:*,ex:*/,://,:#
 setlocal formatoptions+=or
-let b:undo_ftplugin = b:undo_ftplugin
-      \ . '|setlocal comments<'
-      \ . '|setlocal formatoptions<'
+let b:undo_ftplugin .= '|setlocal comments< formatoptions<'
 
 " Stop here if the user doesn't want ftplugin mappings
 if exists('g:no_plugin_maps') || exists('g:no_php_maps')
@@ -23,8 +19,7 @@ if exists('g:no_plugin_maps') || exists('g:no_php_maps')
 endif
 
 " Get rid of the core ftplugin's square-bracket maps on unload
-let b:undo_ftplugin = b:undo_ftplugin
-      \ . '|nunmap <buffer> [['
+let b:undo_ftplugin .= '|nunmap <buffer> [['
       \ . '|ounmap <buffer> [['
       \ . '|nunmap <buffer> ]]'
       \ . '|ounmap <buffer> ]]'