Update of CtrlP, Syntastic, Tagbar, Taglisttoo, and Mark plugins

bundle/git_ctrlp/autoload/ctrlp/buffertag.vim

@@ -149,8 +149,11 @@ fu! s:esctagscmd(bin, args, ...)
 	if exists('+ssl')
 		let [ssl, &ssl] = [&ssl, 0]
 	en
-	let fname = a:0 == 1 ? shellescape(a:1) : ''
+	let fname = a:0 ? shellescape(a:1) : ''
 	let cmd = shellescape(a:bin).' '.a:args.' '.fname
+	if &sh =~ 'cmd\.exe'
+		let cmd = substitute(cmd, '[&()@^<>|]', '^\0', 'g')
+	en
 	if exists('+ssl')
 		let &ssl = ssl
 	en
@@ -170,12 +173,14 @@ fu! s:process(fname, ftype)
 	el
 		let data = s:exectagsonfile(a:fname, a:ftype)
 		let [raw, lines] = [split(data, '\n\+'), []]
-		for line in raw | if len(split(line, ';"')) == 2
-			let parsed_line = s:parseline(line)
-			if parsed_line != ''
-				cal add(lines, parsed_line)
+		for line in raw
+			if line !~# '^!_TAG_' && len(split(line, ';"')) == 2
+				let parsed_line = s:parseline(line)
+				if parsed_line != ''
+					cal add(lines, parsed_line)
+				en
 			en
-		en | endfo
+		endfo
 		let cache = { a:fname : { 'time': ftime, 'lines': lines } }
 		cal extend(g:ctrlp_buftags, cache)
 	en
@@ -183,8 +188,8 @@ fu! s:process(fname, ftype)
 endf
 
 fu! s:parseline(line)
-	let eval = '\v^([^\t]+)\t(.+)\t\/\^(.+)\$\/\;\"\t(.+)\tline(no)?\:(\d+)'
-	let vals = matchlist(a:line, eval)
+	let vals = matchlist(a:line,
+		\ '\v^([^\t]+)\t(.+)\t[?/]\^?(.{-1,})\$?[?/]\;\"\t(.+)\tline(no)?\:(\d+)')
 	if vals == [] | retu '' | en
 	let [bufnr, bufname] = [bufnr('^'.vals[2].'$'), fnamemodify(vals[2], ':p:t')]
 	retu vals[1].'	'.vals[4].'|'.bufnr.':'.bufname.'|'.vals[6].'| '.vals[3]
@@ -200,6 +205,19 @@ fu! s:syntax()
 		sy match CtrlPTabExtra '\zs\t.*\ze$' contains=CtrlPBufName,CtrlPTagKind
 	en
 endf
+
+fu! s:chknearby(pat)
+	if match(getline('.'), a:pat) < 0
+		let [int, forw, maxl] = [1, 1, line('$')]
+		wh !search(a:pat, 'W'.( forw ? '' : 'b' ))
+			if !forw
+				if int > maxl | brea | en
+				let int += int
+			en
+			let forw = !forw
+		endw
+	en
+endf
 " Public {{{1
 fu! ctrlp#buffertag#init(fname)
 	let bufs = exists('s:btmode') && s:btmode
@@ -208,7 +226,7 @@ fu! ctrlp#buffertag#init(fname)
 	let lines = []
 	for each in bufs
 		let bname = fnamemodify(each, ':p')
-		let tftype = get(split(getbufvar(bname, '&ft'), '\.'), 0, '')
+		let tftype = get(split(getbufvar('^'.bname.'$', '&ft'), '\.'), 0, '')
 		cal extend(lines, s:process(bname, tftype))
 	endfo
 	cal s:syntax()
@@ -216,10 +234,15 @@ fu! ctrlp#buffertag#init(fname)
 endf
 
 fu! ctrlp#buffertag#accept(mode, str)
-	let vals = matchlist(a:str, '\v^[^\t]+\t+[^\t|]+\|(\d+)\:[^\t|]+\|(\d+)\|')
-	if vals == [] | retu | en
-	let [bufnm, linenr] = [fnamemodify(bufname(str2nr(vals[1])), ':p'), vals[2]]
-	cal ctrlp#acceptfile(a:mode, bufnm, linenr)
+	let vals = matchlist(a:str,
+		\ '\v^[^\t]+\t+[^\t|]+\|(\d+)\:[^\t|]+\|(\d+)\|\s(.+)$')
+	let bufnr = str2nr(get(vals, 1))
+	if bufnr
+		cal ctrlp#acceptfile(a:mode, bufname(bufnr))
+		exe 'norm!' str2nr(get(vals, 2, line('.'))).'G'
+		cal s:chknearby('\V\C'.get(vals, 3, ''))
+		sil! norm! zvzz
+	en
 endf
 
 fu! ctrlp#buffertag#cmd(mode, ...)

bundle/git_ctrlp/autoload/ctrlp/changes.vim

@@ -71,10 +71,9 @@ endf
 
 fu! ctrlp#changes#accept(mode, str)
 	let info = matchlist(a:str, '\t|\(\d\+\):[^|]\+|\(\d\+\):\(\d\+\)|$')
-	if info == [] | retu | en
 	let bufnr = str2nr(get(info, 1))
 	if bufnr
-		cal ctrlp#acceptfile(a:mode, fnamemodify(bufname(bufnr), ':p'))
+		cal ctrlp#acceptfile(a:mode, bufname(bufnr))
 		cal cursor(get(info, 2), get(info, 3))
 		sil! norm! zvzz
 	en

bundle/git_ctrlp/autoload/ctrlp/dir.vim

@@ -10,12 +10,7 @@ if exists('g:loaded_ctrlp_dir') && g:loaded_ctrlp_dir
 en
 let [g:loaded_ctrlp_dir, g:ctrlp_newdir] = [1, 0]
 
-let s:ars = [
-	\ 's:maxdepth',
-	\ 's:maxfiles',
-	\ 's:compare_lim',
-	\ 's:glob',
-	\ ]
+let s:ars = ['s:maxdepth', 's:maxfiles', 's:compare_lim', 's:glob', 's:caching']
 
 cal add(g:ctrlp_ext_vars, {
 	\ 'init': 'ctrlp#dir#init('.join(s:ars, ', ').')',
@@ -27,6 +22,8 @@ cal add(g:ctrlp_ext_vars, {
 	\ })
 
 let s:id = g:ctrlp_builtins + len(g:ctrlp_ext_vars)
+
+let s:dircounts = {}
 " Utilities {{{1
 fu! s:globdirs(dirs, depth)
 	let entries = split(globpath(a:dirs, s:glob), "\n")
@@ -35,12 +32,17 @@ fu! s:globdirs(dirs, depth)
 	let nr = len(g:ctrlp_alldirs)
 	if !empty(dirs) && !s:max(nr, s:maxfiles) && depth <= s:maxdepth
 		sil! cal ctrlp#progress(nr)
+		cal map(dirs, 'ctrlp#utils#fnesc(v:val, "g", ",")')
 		cal s:globdirs(join(dirs, ','), depth)
 	en
 endf
 
 fu! s:max(len, max)
-	retu a:max && a:len > a:max ? 1 : 0
+	retu a:max && a:len > a:max
+endf
+
+fu! s:nocache()
+	retu !s:caching || ( s:caching > 1 && get(s:dircounts, s:cwd) < s:caching )
 endf
 " Public {{{1
 fu! ctrlp#dir#init(...)
@@ -50,9 +52,9 @@ fu! ctrlp#dir#init(...)
 	endfo
 	let cadir = ctrlp#utils#cachedir().ctrlp#utils#lash().'dir'
 	let cafile = cadir.ctrlp#utils#lash().ctrlp#utils#cachefile('dir')
-	if g:ctrlp_newdir || !filereadable(cafile)
+	if g:ctrlp_newdir || s:nocache() || !filereadable(cafile)
 		let [s:initcwd, g:ctrlp_alldirs] = [s:cwd, []]
-		cal s:globdirs(s:cwd, 0)
+		cal s:globdirs(ctrlp#utils#fnesc(s:cwd, 'g', ','), 0)
 		cal ctrlp#rmbasedir(g:ctrlp_alldirs)
 		if len(g:ctrlp_alldirs) <= s:compare_lim
 			cal sort(g:ctrlp_alldirs, 'ctrlp#complen')
@@ -65,6 +67,7 @@ fu! ctrlp#dir#init(...)
 			let g:ctrlp_alldirs = ctrlp#utils#readfile(cafile)
 		en
 	en
+	cal extend(s:dircounts, { s:cwd : len(g:ctrlp_alldirs) })
 	retu g:ctrlp_alldirs
 endf
 

bundle/git_ctrlp/autoload/ctrlp/line.vim

@@ -48,10 +48,9 @@ endf
 
 fu! ctrlp#line#accept(mode, str)
 	let info = matchlist(a:str, '\t|[^|]\+|\(\d\+\):\(\d\+\)|$')
-	if info == [] | retu | en
-	let [bufnr, linenr] = [str2nr(get(info, 1)), get(info, 2)]
-	if bufnr > 0
-		cal ctrlp#acceptfile(a:mode, fnamemodify(bufname(bufnr), ':p'), linenr)
+	let bufnr = str2nr(get(info, 1))
+	if bufnr
+		cal ctrlp#acceptfile(a:mode, bufname(bufnr), get(info, 2))
 	en
 endf
 

bundle/git_ctrlp/autoload/ctrlp/mrufiles.vim

@@ -48,15 +48,19 @@ endf
 fu! s:record(bufnr)
 	if s:locked | retu | en
 	let bufnr = a:bufnr + 0
-	if bufnr <= 0 | retu | en
 	let bufname = bufname(bufnr)
-	if empty(bufname) | retu | en
-	let fn = fnamemodify(bufname, ':p')
+	if bufnr > 0 && !empty(bufname)
+		cal filter(s:mrbs, 'v:val != bufnr')
+		cal insert(s:mrbs, bufnr)
+		cal s:addtomrufs(bufname)
+	en
+endf
+
+fu! s:addtomrufs(fname)
+	let fn = fnamemodify(a:fname, ':p')
 	let fn = exists('+ssl') ? tr(fn, '/', '\') : fn
-	cal filter(s:mrbs, 'v:val != bufnr')
-	cal insert(s:mrbs, bufnr)
 	if ( !empty({s:in}) && fn !~# {s:in} ) || ( !empty({s:ex}) && fn =~# {s:ex} )
-		\ || !empty(&bt) || !filereadable(fn) | retu
+		\ || !empty(getbufvar('^'.fn.'$', '&bt')) || !filereadable(fn) | retu
 	en
 	cal filter(s:mrufs, 'v:val !='.( {s:cseno} ? '#' : '?' ).' fn')
 	cal insert(s:mrufs, fn)
@@ -87,6 +91,12 @@ fu! ctrlp#mrufiles#remove(files)
 	retu s:reformat(copy(s:mrufs))
 endf
 
+fu! ctrlp#mrufiles#add(fn)
+	if !empty(a:fn)
+		cal s:addtomrufs(a:fn)
+	en
+endf
+
 fu! ctrlp#mrufiles#list(...)
 	retu a:0 ? a:1 == 'raw' ? s:mergelists() : 0 : s:reformat(s:mergelists())
 endf

bundle/git_ctrlp/autoload/ctrlp/quickfix.vim

@@ -40,18 +40,15 @@ fu! ctrlp#quickfix#init()
 endf
 
 fu! ctrlp#quickfix#accept(mode, str)
-	let items = matchlist(a:str, '^\([^|]\+\ze\)|\(\d\+\):\(\d\+\)|')
-	if items == [] | retu | en
-	let [md, filpath] = [a:mode, fnamemodify(items[1], ':p')]
-	if empty(filpath) | retu | en
-	cal ctrlp#exit()
-	let cmd = md == 't' ? 'tabe' : md == 'h' ? 'new' : md == 'v' ? 'vne'
-		\ : ctrlp#normcmd('e')
-	let cmd = cmd == 'e' && &modified ? 'hid e' : cmd
-	exe cmd ctrlp#fnesc(filpath)
-	cal cursor(items[2], items[3])
+	let vals = matchlist(a:str, '^\([^|]\+\ze\)|\(\d\+\):\(\d\+\)|')
+	if vals == [] || vals[1] == '' | retu | en
+	cal ctrlp#acceptfile(a:mode, vals[1])
+	let cur_pos = getpos('.')[1:2]
+	if cur_pos != [1, 1] && cur_pos != map(vals[2:3], 'str2nr(v:val)')
+		mark '
+	en
+	cal cursor(vals[2], vals[3])
 	sil! norm! zvzz
-	cal ctrlp#setlcdir()
 endf
 
 fu! ctrlp#quickfix#id()

bundle/git_ctrlp/autoload/ctrlp/rtscript.vim

@@ -11,7 +11,7 @@ en
 let [g:loaded_ctrlp_rtscript, g:ctrlp_newrts] = [1, 0]
 
 cal add(g:ctrlp_ext_vars, {
-	\ 'init': 'ctrlp#rtscript#init()',
+	\ 'init': 'ctrlp#rtscript#init(s:caching)',
 	\ 'accept': 'ctrlp#acceptfile',
 	\ 'lname': 'runtime scripts',
 	\ 'sname': 'rts',
@@ -20,24 +20,34 @@ cal add(g:ctrlp_ext_vars, {
 	\ })
 
 let s:id = g:ctrlp_builtins + len(g:ctrlp_ext_vars)
+
+let s:filecounts = {}
+" Utilities {{{1
+fu! s:nocache()
+	retu g:ctrlp_newrts ||
+		\ !s:caching || ( s:caching > 1 && get(s:filecounts, s:cwd) < s:caching )
+endf
 " Public {{{1
-fu! ctrlp#rtscript#init()
-	if g:ctrlp_newrts
-		\ || !( exists('g:ctrlp_rtscache') && g:ctrlp_rtscache[0] == &rtp )
+fu! ctrlp#rtscript#init(caching)
+	let [s:caching, s:cwd] = [a:caching, getcwd()]
+	if s:nocache() ||
+		\ !( exists('g:ctrlp_rtscache') && g:ctrlp_rtscache[0] == &rtp )
 		sil! cal ctrlp#progress('Indexing...')
-		let entries = split(globpath(&rtp, '**/*.*'), "\n")
+		let entries = split(globpath(ctrlp#utils#fnesc(&rtp, 'g'), '**/*.*'), "\n")
 		cal filter(entries, 'count(entries, v:val) == 1')
 		let [entries, echoed] = [ctrlp#dirnfile(entries)[1], 1]
 	el
 		let [entries, results] = g:ctrlp_rtscache[2:3]
 	en
-	let cwd = getcwd()
-	if g:ctrlp_newrts
-		\ || !( exists('g:ctrlp_rtscache') && g:ctrlp_rtscache[:1] == [&rtp, cwd] )
-		if !exists('echoed') | sil! cal ctrlp#progress('Processing...') | en
+	if s:nocache() ||
+		\ !( exists('g:ctrlp_rtscache') && g:ctrlp_rtscache[:1] == [&rtp, s:cwd] )
+		if !exists('echoed')
+			sil! cal ctrlp#progress('Processing...')
+		en
 		let results = map(copy(entries), 'fnamemodify(v:val, '':.'')')
 	en
-	let [g:ctrlp_rtscache, g:ctrlp_newrts] = [[&rtp, cwd, entries, results], 0]
+	let [g:ctrlp_rtscache, g:ctrlp_newrts] = [[&rtp, s:cwd, entries, results], 0]
+	cal extend(s:filecounts, { s:cwd : len(results) })
 	retu results
 endf
 

bundle/git_ctrlp/autoload/ctrlp/tag.vim

@@ -23,9 +23,20 @@ let s:id = g:ctrlp_builtins + len(g:ctrlp_ext_vars)
 " Utilities {{{1
 fu! s:findcount(str)
 	let [tg, fname] = split(a:str, '\t\+\ze[^\t]\+$')
-	let [fname, tgs] = [expand(fname, 1), taglist('^'.tg.'$')]
-	if empty(tgs) | retu [1, 1] | en
-	let [fnd, ct, pos] = [0, 0, 0]
+	let tgs = taglist('^'.tg.'$')
+	if len(tgs) < 2
+		retu [1, 1]
+	en
+	let bname = fnamemodify(bufname('%'), ':p')
+	let fname = expand(fnamemodify(simplify(fname), ':s?^[.\/]\+??:p:.'), 1)
+	let [fnd, ct, pos, idx] = [0, 0, 0, 0]
+	wh idx < len(tgs)
+		if bname == fnamemodify(tgs[idx]["filename"], ':p')
+			cal insert(tgs, remove(tgs, idx))
+			brea
+		en
+		let idx += 1
+	endw
 	for each in tgs
 		let ct += 1
 		let fulname = fnamemodify(each["filename"], ':p')
@@ -43,11 +54,11 @@ fu! s:filter(tags)
 	let nr = 0
 	wh 0 < 1
 		if a:tags == [] | brea | en
-		if a:tags[nr] =~ '^!' && a:tags[nr] !~ '^!_TAG_'
+		if a:tags[nr] =~ '^!' && a:tags[nr] !~# '^!_TAG_'
 			let nr += 1
 			con
 		en
-		if a:tags[nr] =~ '^!_TAG_' && len(a:tags) > nr
+		if a:tags[nr] =~# '^!_TAG_' && len(a:tags) > nr
 			cal remove(a:tags, nr)
 		el
 			brea
@@ -86,8 +97,9 @@ fu! ctrlp#tag#accept(mode, str)
 		\ 'e': ['', 'tj'],
 		\ }
 	let cmd = fnd[0] == 1 ? cmds[a:mode][0] : cmds[a:mode][1]
-	let cmd = cmd == 'tj' && &modified ? 'hid '.cmd : cmd
-	let cmd = cmd =~ '^tab' ? tabpagenr('$').cmd : cmd
+	let cmd = a:mode == 'e' && ctrlp#modfilecond(!&aw)
+		\ ? ( cmd == 'tj' ? 'stj' : 'sp' ) : cmd
+	let cmd = a:mode == 't' ? ctrlp#tabcount().cmd : cmd
 	if fnd[0] == 1
 		if cmd != ''
 			exe cmd

bundle/git_ctrlp/autoload/ctrlp/utils.vim

@@ -8,25 +8,28 @@
 fu! ctrlp#utils#lash()
 	retu &ssl || !exists('+ssl') ? '/' : '\'
 endf
-let s:lash = ctrlp#utils#lash()
 
 fu! s:lash(...)
 	retu ( a:0 ? a:1 : getcwd() ) !~ '[\/]$' ? s:lash : ''
 endf
 
 fu! ctrlp#utils#opts()
+	let s:lash = ctrlp#utils#lash()
 	let usrhome = $HOME.s:lash($HOME)
 	let cahome = exists('$XDG_CACHE_HOME') ? $XDG_CACHE_HOME : usrhome.'.cache'
-	let s:cache_dir = isdirectory(usrhome.'.ctrlp_cache')
+	let cadir = isdirectory(usrhome.'.ctrlp_cache')
 		\ ? usrhome.'.ctrlp_cache' : cahome.s:lash(cahome).'ctrlp'
 	if exists('g:ctrlp_cache_dir')
-		let s:cache_dir = expand(g:ctrlp_cache_dir, 1)
-		if isdirectory(s:cache_dir.s:lash(s:cache_dir).'.ctrlp_cache')
-			let s:cache_dir = s:cache_dir.s:lash(s:cache_dir).'.ctrlp_cache'
+		let cadir = expand(g:ctrlp_cache_dir, 1)
+		if isdirectory(cadir.s:lash(cadir).'.ctrlp_cache')
+			let cadir = cadir.s:lash(cadir).'.ctrlp_cache'
 		en
 	en
+	let s:cache_dir = cadir
 endf
 cal ctrlp#utils#opts()
+
+let s:wig_cond = v:version > 702 || ( v:version == 702 && has('patch051') )
 " Files and Directories {{{1
 fu! ctrlp#utils#cachedir()
 	retu s:cache_dir
@@ -64,8 +67,53 @@ fu! ctrlp#utils#writecache(lines, ...)
 endf
 
 fu! ctrlp#utils#glob(...)
-	let cond = v:version > 702 || ( v:version == 702 && has('patch051') )
-	retu call('glob', cond ? a:000 : [a:1])
+	let path = ctrlp#utils#fnesc(a:1, 'g')
+	retu s:wig_cond ? glob(path, a:2) : glob(path)
+endf
+
+fu! ctrlp#utils#globpath(...)
+	retu call('globpath', s:wig_cond ? a:000 : a:000[:1])
+endf
+
+fu! ctrlp#utils#fnesc(path, type, ...)
+	if exists('*fnameescape')
+		if exists('+ssl')
+			if a:type == 'c'
+				let path = escape(a:path, '%#')
+			elsei a:type == 'f'
+				let path = fnameescape(a:path)
+			elsei a:type == 'g'
+				let path = escape(a:path, '?*')
+			en
+			let path = substitute(path, '[', '[[]', 'g')
+		el
+			let path = fnameescape(a:path)
+		en
+	el
+		if exists('+ssl')
+			if a:type == 'c'
+				let path = escape(a:path, '%#')
+			elsei a:type == 'f'
+				let path = escape(a:path, " \t\n%#*?|<\"")
+			elsei a:type == 'g'
+				let path = escape(a:path, '?*')
+			en
+			let path = substitute(path, '[', '[[]', 'g')
+		el
+			let path = escape(a:path, " \t\n*?[{`$\\%#'\"|!<")
+		en
+	en
+	retu a:0 ? escape(path, a:1) : path
+endf
+
+fu! ctrlp#utils#dircompl(...)
+	let [hsl, str] = [match(a:1, '[\/]'), '']
+	let par = substitute(a:1, '[^\/]*$', '', '')
+	let path = !hsl ? par : hsl > 0 ? getcwd().s:lash().par : getcwd()
+	for dir in split(globpath(ctrlp#utils#fnesc(path, 'g', ','), '*/'), '\n')
+		let str .= par.split(dir, '[\/]')[-1]."\n"
+	endfo
+	retu str
 endf
 "}}}