From: Simon Ruderich Date: Fri, 22 Jun 2012 21:16:22 +0000 (+0200) Subject: vim/plugin/securemodelines.vim: Merge version ca214e9f70. X-Git-Url: https://ruderich.org/simon/gitweb/?a=commitdiff_plain;h=3ec481c18ca1cd8a965c264b5505844c510ae7be;p=config%2Fdotfiles.git vim/plugin/securemodelines.vim: Merge version ca214e9f70. --- diff --git a/vim/plugin/securemodelines.vim b/vim/plugin/securemodelines.vim index bb4b60f..78cb3f1 100644 --- a/vim/plugin/securemodelines.vim +++ b/vim/plugin/securemodelines.vim @@ -1,8 +1,8 @@ " vim: set sw=4 sts=4 et ft=vim : " Script: securemodelines.vim -" Version: 20070518 -" Author: Ciaran McCreesh -" Homepage: http://ciaranm.org/tag/securemodelines +" Version: ca214e9f709242313e94f0f7ab3a4058058b2ba2 +" Author: Ciaran McCreesh +" Homepage: http://github.com/ciaranm/securemodelines " Requires: Vim 7 " License: Redistribute under the same terms as Vim itself " Purpose: A secure alternative to modelines @@ -45,7 +45,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 @@ -61,13 +61,13 @@ fun! IsInList(list, i) abort endfun fun! 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 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 @@ -98,7 +98,7 @@ fun! CheckVersion(op, ver) abort endfun fun! DoModeline(line) abort - let l:matches = matchlist(a:line, '\%(\S\@=]\?\)\([0-9]\+\)\?\)\|\sex\):\s*set\?\s\+\([^:]\+\):\S\@!') + let l:matches = matchlist(a:line, '\%(\S\@=]\?\)\([0-9]\+\)\?\)\|\sex\):\s*\%(set\s\+\)\?\([^:]\+\):\S\@!') if len(l:matches) > 0 let l:operator = ">" if len(l:matches[1]) > 0 @@ -149,6 +149,6 @@ endfun aug SecureModeLines au! - au BufRead * :call DoModelines() + au BufRead,StdinReadPost * :call DoModelines() aug END