plugin/securemodelines.vim: Merge version 10d6c6b52f.

diff --git a/vim/plugin/securemodelines.vim b/vim/plugin/securemodelines.vim
index 78cb3f1312314c49c952b5d21918207a760c9e2b..2893b4892b97a23b89cb43dd4cc71f35f4a962e6 100644 (file)
--- a/vim/plugin/securemodelines.vim
+++ b/vim/plugin/securemodelines.vim
@@ -1,17 +1,13 @@
 " vim: set sw=4 sts=4 et ft=vim :
 " Script:           securemodelines.vim
-" Version:          ca214e9f709242313e94f0f7ab3a4058058b2ba2
+" Version:          10d6c6b52fcdd12f3ba457126f66fee4ccceec04
 " Author:           Ciaran McCreesh <ciaran.mccreesh at googlemail.com>
 " Homepage:         http://github.com/ciaranm/securemodelines
 " Requires:         Vim 7
 " License:          Redistribute under the same terms as Vim itself
 " Purpose:          A secure alternative to modelines
 
-if &compatible || v:version < 700
-    finish
-endif
-
-if exists("g:loaded_securemodelines")
+if &compatible || v:version < 700 || exists('g:loaded_securemodelines')
     finish
 endif
 let g:loaded_securemodelines = 1
@@ -27,6 +23,9 @@ if (! exists("g:secure_modelines_allowed_items"))
                 \ "foldmethod",  "fdm",
                 \ "readonly",    "ro",   "noreadonly", "noro",
                 \ "rightleft",   "rl",   "norightleft", "norl",
+                \ "cindent",     "cin",  "nocindent", "nocin",
+                \ "smartindent", "si",   "nosmartindent", "nosi",
+                \ "autoindent",  "ai",   "noautoindent", "noai",
                 \ "spell",
                 \ "spelllang"
                 \ ]