Fix for missing shellescape() in < 7.0.111

plugin/tagbar.vim

@@ -4,7 +4,7 @@
 " Author:      Jan Larres <jan@majutsushi.net>
 " Licence:     Vim licence
 " Website:     http://majutsushi.github.com/tagbar/
-" Version:     2.4.1
+" Version:     2.2
 " Note:        This plugin was heavily inspired by the 'Taglist' plugin by
 "              Yegappan Lakshmanan and uses a small amount of code from it.
 "
@@ -33,15 +33,6 @@ if v:version < 700
     finish
 endif
 
-if v:version == 700 && !has('patch167')
-    echohl WarningMsg
-    echomsg 'Tagbar: Vim versions lower than 7.0.167 have a bug'
-          \ 'that prevents this version of Tagbar from working.'
-          \ 'Please use the alternate version posted on the website.'
-    echohl None
-    finish
-endif
-
 if !exists('g:tagbar_left')
     let g:tagbar_left = 0
 endif
@@ -78,13 +69,8 @@ if !exists('g:tagbar_foldlevel')
     let g:tagbar_foldlevel = 99
 endif
 
-if !exists('g:tagbar_iconchars')
-    if has('multi_byte') && has('unix') && &encoding == 'utf-8' &&
-     \ (empty(&termencoding) || &termencoding == 'utf-8')
-        let g:tagbar_iconchars = ['▶', '▼']
-    else
-        let g:tagbar_iconchars = ['+', '-']
-    endif
+if !exists('g:tagbar_usearrows')
+    let g:tagbar_usearrows = 0
 endif
 
 if !exists('g:tagbar_autoshowtag')
@@ -109,11 +95,8 @@ command! -nargs=0 TagbarToggle        call tagbar#ToggleWindow()
 command! -nargs=? TagbarOpen          call tagbar#OpenWindow(<f-args>)
 command! -nargs=0 TagbarOpenAutoClose call tagbar#OpenWindow('fc')
 command! -nargs=0 TagbarClose         call tagbar#CloseWindow()
-command! -nargs=1 -bang TagbarSetFoldlevel  call tagbar#SetFoldLevel(<args>, <bang>0)
+command! -nargs=1 TagbarSetFoldlevel  call tagbar#SetFoldLevel(<args>)
 command! -nargs=0 TagbarShowTag       call tagbar#OpenParents()
-command! -nargs=1 TagbarGetTypeConfig call tagbar#gettypeconfig(<f-args>)
-command! -nargs=? TagbarDebug         call tagbar#StartDebug(<f-args>)
-command! -nargs=0 TagbarDebugEnd      call tagbar#StopDebug()
 
 " Modeline {{{1
 " vim: ts=8 sw=4 sts=4 et foldenable foldmethod=marker foldcolumn=1

syntax/tagbar.vim

@@ -3,7 +3,7 @@
 " Author:      Jan Larres <jan@majutsushi.net>
 " Licence:     Vim licence
 " Website:     http://majutsushi.github.com/tagbar/
-" Version:     2.4.1
+" Version:     2.2
 
 scriptencoding utf-8
 
@@ -11,32 +11,35 @@ if exists("b:current_syntax")
   finish
 endif
 
-let s:ic = g:tagbar_iconchars[0]
-if s:ic =~ '[]^\\-]'
-    let s:ic = '\' . s:ic
+if has('multi_byte') && has('unix') && &encoding == 'utf-8' &&
+ \ (empty(&termencoding) || &termencoding == 'utf-8')
+    syntax match TagbarKind  '\([▶▼] \)\@<=[^-+: ]\+[^:]\+$'
+    syntax match TagbarScope '\([▶▼][-+# ]\)\@<=[^*]\+\(\*\?\(([^)]\+)\)\? :\)\@='
+
+    syntax match TagbarFoldIcon '[▶▼]\([-+# ]\)\@='
+
+    syntax match TagbarAccessPublic    '\([▶▼ ]\)\@<=+\([^-+# ]\)\@='
+    syntax match TagbarAccessProtected '\([▶▼ ]\)\@<=#\([^-+# ]\)\@='
+    syntax match TagbarAccessPrivate   '\([▶▼ ]\)\@<=-\([^-+# ]\)\@='
+elseif has('multi_byte') && (has('win32') || has('win64')) && g:tagbar_usearrows
+    syntax match TagbarKind  '\([▷◢] \)\@<=[^-+: ]\+[^:]\+$'
+    syntax match TagbarScope '\([▷◢][-+# ]\)\@<=[^*]\+\(\*\?\(([^)]\+)\)\? :\)\@='
+
+    syntax match TagbarFoldIcon '[▷◢]\([-+# ]\)\@='
+
+    syntax match TagbarAccessPublic    '\([▷◢ ]\)\@<=+\([^-+# ]\)\@='
+    syntax match TagbarAccessProtected '\([▷◢ ]\)\@<=#\([^-+# ]\)\@='
+    syntax match TagbarAccessPrivate   '\([▷◢ ]\)\@<=-\([^-+# ]\)\@='
+else
+    syntax match TagbarKind  '\([-+] \)\@<=[^-+: ]\+[^:]\+$'
+    syntax match TagbarScope '\([-+][-+# ]\)\@<=[^*]\+\(\*\?\(([^)]\+)\)\? :\)\@='
+
+    syntax match TagbarFoldIcon '[-+]\([-+# ]\)\@='
+
+    syntax match TagbarAccessPublic    '\([-+ ]\)\@<=+\([^-+# ]\)\@='
+    syntax match TagbarAccessProtected '\([-+ ]\)\@<=#\([^-+# ]\)\@='
+    syntax match TagbarAccessPrivate   '\([-+ ]\)\@<=-\([^-+# ]\)\@='
 endif
-let s:io = g:tagbar_iconchars[1]
-if s:io =~ '[]^\\-]'
-    let s:io = '\' . s:io
-endif
-
-let s:pattern = '\([' . s:ic . s:io . '] \)\@<=[^-+: ]\+[^:]\+$'
-execute "syntax match TagbarKind '" . s:pattern . "'"
-
-let s:pattern = '\([' . s:ic . s:io . '][-+# ]\)\@<=[^*]\+\(\*\?\(([^)]\+)\)\? :\)\@='
-execute "syntax match TagbarScope '" . s:pattern . "'"
-
-let s:pattern = '[' . s:ic . s:io . ']\([-+# ]\)\@='
-execute "syntax match TagbarFoldIcon '" . s:pattern . "'"
-
-let s:pattern = '\([' . s:ic . s:io . ' ]\)\@<=+\([^-+# ]\)\@='
-execute "syntax match TagbarAccessPublic '" . s:pattern . "'"
-let s:pattern = '\([' . s:ic . s:io . ' ]\)\@<=#\([^-+# ]\)\@='
-execute "syntax match TagbarAccessProtected '" . s:pattern . "'"
-let s:pattern = '\([' . s:ic . s:io . ' ]\)\@<=-\([^-+# ]\)\@='
-execute "syntax match TagbarAccessPrivate '" . s:pattern . "'"
-
-unlet s:pattern
 
 syntax match TagbarNestedKind '^\s\+\[[^]]\+\]$'
 syntax match TagbarComment    '^".*'