Update

4 files changed, 16 insertions, 19 deletions

diff --git a/ftplugin/epuppet.vim b/ftplugin/epuppet.vim
index 482d2af1..9c2156d5 100644
--- a/ftplugin/epuppet.vim
+++ b/ftplugin/epuppet.vim
@@ -9,7 +9,7 @@ endif
 " Last Change:          2019-09-01
 
 " Only do this when not done yet for this buffer
-if exists("b:did_ftplugin")
+if exists('b:did_ftplugin')
   finish
 endif
 
@@ -17,23 +17,23 @@ let s:save_cpo = &cpo
 set cpo-=C
 
 " Define some defaults in case the included ftplugins don't set them.
-let s:undo_ftplugin = ""
+let s:undo_ftplugin = ''
 let s:browsefilter = "All Files (*.*)\t*.*\n"
-let s:match_words = ""
+let s:match_words = ''
 
 runtime! ftplugin/sh.vim
 unlet! b:did_ftplugin
 
 " Override our defaults if these were set by an included ftplugin.
-if exists("b:undo_ftplugin")
+if exists('b:undo_ftplugin')
   let s:undo_ftplugin = b:undo_ftplugin
   unlet b:undo_ftplugin
 endif
-if exists("b:browsefilter")
+if exists('b:browsefilter')
   let s:browsefilter = b:browsefilter
   unlet b:browsefilter
 endif
-if exists("b:match_words")
+if exists('b:match_words')
   let s:match_words = b:match_words
   unlet b:match_words
 endif
@@ -46,13 +46,13 @@ runtime! ftplugin/puppet.vim
 let b:did_ftplugin = 1
 
 " Combine the new set of values with those previously included.
-if exists("b:undo_ftplugin")
-  let s:undo_ftplugin = b:undo_ftplugin . " | " . s:undo_ftplugin
+if exists('b:undo_ftplugin')
+  let s:undo_ftplugin = b:undo_ftplugin . ' | ' . s:undo_ftplugin
 endif
-if exists ("b:browsefilter")
+if exists ('b:browsefilter')
   let s:browsefilter = substitute(b:browsefilter,'\cAll Files (\*\.\*)\t\*\.\*\n','','') . s:browsefilter
 endif
-if exists("b:match_words")
+if exists('b:match_words')
   let s:match_words = b:match_words . ',' . s:match_words
 endif
 
@@ -64,14 +64,14 @@ let &l:suffixesadd = s:suffixesadd . (s:suffixesadd =~# ',$\|^$' ? '' : ',') . &
 unlet s:include s:path s:suffixesadd
 
 " Load the combined list of match_words for matchit.vim
-if exists("loaded_matchit")
+if exists('loaded_matchit')
   let b:match_words = s:match_words
 endif
 
 " TODO: comments=
 setlocal commentstring=<%#%s%>
 
-let b:undo_ftplugin = "setl cms< "
+let b:undo_ftplugin = 'setl cms< '
       \ " | unlet! b:browsefilter b:match_words | " . s:undo_ftplugin
 
 let &cpo = s:save_cpo
diff --git a/ftplugin/puppet.vim b/ftplugin/puppet.vim
index 0d461238..5316cf5e 100644
--- a/ftplugin/puppet.vim
+++ b/ftplugin/puppet.vim
@@ -8,7 +8,7 @@ endif
 " URL:                  https://github.com/rodjek/vim-puppet
 " Last Change:          2019-08-31
 
-if (exists("b:did_ftplugin"))
+if (exists('b:did_ftplugin'))
   finish
 endif
 let b:did_ftplugin = 1
@@ -25,8 +25,8 @@ setlocal commentstring=#\ %s
 setlocal formatoptions-=t formatoptions+=croql
 setlocal formatexpr=puppet#format#Format()
 
-let b:undo_ftplugin = "
+let b:undo_ftplugin = '
     \ setlocal tabstop< tabstop< softtabstop< shiftwidth< expandtab<
     \| setlocal keywordprg< iskeyword< comments< commentstring<
     \| setlocal formatoptions< formatexpr<
-    \"
+    \'
diff --git a/ftplugin/puppet_tagbar.vim b/ftplugin/puppet_tagbar.vim
index 4e87669e..dc2c73e6 100644
--- a/ftplugin/puppet_tagbar.vim
+++ b/ftplugin/puppet_tagbar.vim
@@ -25,7 +25,7 @@ let g:tagbar_type_puppet = {
   \],
 \}
 
-if puppet#ctags#Type() == 'universal'
+if puppet#ctags#Type() ==? 'universal'
     " There no sense to split objects by colon
     let g:tagbar_type_puppet.sro = '__'
     let g:tagbar_type_puppet.kind2scope = {
diff --git a/ftplugin/terraform.vim b/ftplugin/terraform.vim
index 1f4ef2cc..7e56d9ed 100644
--- a/ftplugin/terraform.vim
+++ b/ftplugin/terraform.vim
@@ -30,9 +30,6 @@ if exists('s:hcl_fold_sections_save')
   let g:hcl_fold_sections = s:hcl_fold_sections_save
 end
 
-let s:cpo_save = &cpoptions
-set cpoptions&vim
-
 if !exists('g:terraform_binary_path')
   let g:terraform_binary_path='terraform'
 endif