[vim-scripts] 10/11: Updated securemodelines

[James McCoy]

This is an automated email from the git hooks/post-receive script.

jamessan pushed a commit to branch master
in repository vim-scripts.

commit b4bf2f4c265ad23a9e3dc8d603ca762ccde6bb7e
Author: James McCoy <jamessan at debian.org>
Date:   Wed Aug 14 23:57:50 2013 -0400

    Updated securemodelines
    
    Signed-off-by: James McCoy <jamessan at debian.org>
---
 debian/changelog                               |    2 ++
 debian/patches/disabledby-securemodelines.diff |   18 ------------------
 debian/patches/series                          |    1 -
 plugin/securemodelines.vim                     |   21 ++++++++++++---------
 4 files changed, 14 insertions(+), 28 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 960d5c5..82f4853 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ vim-scripts (20121008) UNRELEASED; urgency=low
     - gnupg: Updated to 2.5  (Closes: #717049)
     - taglist: Updated to 4.6  (Closes: #719613)
     - Align: Updated to 37/43
+    - securemodelines  (Closes: #642057)
+      + Remove patch disabledby-securemodelines.diff, merged upstream
   * Add po-escape.diff to properly escape filenames when calling msgfmt.
     (Closes: #697135)
   * debian/vim-scripts.pl: Remove logged ip address from downloaded
diff --git a/debian/patches/disabledby-securemodelines.diff b/debian/patches/disabledby-securemodelines.diff
deleted file mode 100644
index f81c565..0000000
--- a/debian/patches/disabledby-securemodelines.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-## disabledby-securemodelines.diff by James Vega <jamessan at debian.org>
-
-Index: vim-scripts/plugin/securemodelines.vim
-===================================================================
---- vim-scripts.orig/plugin/securemodelines.vim
-+++ vim-scripts/plugin/securemodelines.vim
-@@ -11,6 +11,11 @@
-     finish
- endif
- 
-+if exists("g:loaded_securemodelines")
-+    finish
-+endif
-+let g:loaded_securemodelines = 1
-+
- if (! exists("g:secure_modelines_allowed_items"))
-     let g:secure_modelines_allowed_items = [
-                 \ "textwidth",   "tw",
diff --git a/debian/patches/series b/debian/patches/series
index d16e4e3..27dc82b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,7 +5,6 @@ disabledby-cvsmenu.diff
 disabledby-info.diff
 disabledby-omnicppcomplete.diff
 disabledby-po.diff
-disabledby-securemodelines.diff
 disabledby-tetris.diff
 disabledby-color_sample_pack.diff
 disabledby-whatdomain.diff
diff --git a/plugin/securemodelines.vim b/plugin/securemodelines.vim
index e862a17..58c3e51 100644
--- a/plugin/securemodelines.vim
+++ b/plugin/securemodelines.vim
@@ -1,15 +1,15 @@
 " vim: set sw=4 sts=4 et ft=vim :
 " Script:           securemodelines.vim
-" Version:          20070518
-" Author:           Ciaran McCreesh <ciaranm at ciaranm.org>
-" Homepage:         http://ciaranm.org/tag/securemodelines
+" 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
+if &compatible || v:version < 700 || exists('g:loaded_securemodelines')
     finish
 endif
+let g:loaded_securemodelines = 1
 
 if (! exists("g:secure_modelines_allowed_items"))
     let g:secure_modelines_allowed_items = [
@@ -22,6 +22,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"
                 \ ]
@@ -40,7 +43,7 @@ if (! exists("g:secure_modelines_leave_modeline"))
         set nomodeline
         if g:secure_modelines_verbose
             echohl WarningMsg
-            echomsg "Forcibly disabling internal modelines for securemodelines.vim"
+            echo "Forcibly disabling internal modelines for securemodelines.vim"
             echohl None
         endif
     endif
@@ -56,13 +59,13 @@ fun! <SID>IsInList(list, i) abort
 endfun
 
 fun! <SID>DoOne(item) abort
-    let l:matches = matchlist(a:item, '^\([a-z]\+\)\%(=[a-zA-Z0-9_\-.]\+\)\?$')
+    let l:matches = matchlist(a:item, '^\([a-z]\+\)\%([-+^]\?=[a-zA-Z0-9_\-.]\+\)\?$')
     if len(l:matches) > 0
         if <SID>IsInList(g:secure_modelines_allowed_items, l:matches[1])
             exec "setlocal " . a:item
         elseif g:secure_modelines_verbose
             echohl WarningMsg
-            echomsg "Ignoring '" . a:item . "' in modeline"
+            echo "Ignoring '" . a:item . "' in modeline"
             echohl None
         endif
     endif
@@ -93,7 +96,7 @@ fun! <SID>CheckVersion(op, ver) abort
 endfun
 
 fun! <SID>DoModeline(line) abort
-    let l:matches = matchlist(a:line, '\%(\S\@<!\%(vi\|vim\([<>=]\?\)\([0-9]\+\)\?\)\|\sex\):\s*set\?\s\+\([^:]\+\):\S\@!')
+    let l:matches = matchlist(a:line, '\%(\S\@<!\%(vi\|vim\([<>=]\?\)\([0-9]\+\)\?\)\|\sex\):\s*\%(set\s\+\)\?\([^:]\+\):\S\@!')
     if len(l:matches) > 0
         let l:operator = ">"
         if len(l:matches[1]) > 0
@@ -144,6 +147,6 @@ endfun
 
 aug SecureModeLines
     au!
-    au BufRead * :call <SID>DoModelines()
+    au BufRead,StdinReadPost * :call <SID>DoModelines()
 aug END
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vim/vim-scripts.git