Updated plugins

Author: amix

sources_non_forked/ctrlp.vim/autoload/ctrlp.vim

@@ -259,6 +259,10 @@ fu! s:match_window_opts()
 \ s:mw =~ 'min:[^,]\+' ? str2nr(matchstr(s:mw, 'min:\zs\d\+')) : 1
 let [s:mw_max, s:mw_min] = [max([s:mw_max, 1]), max([s:mw_min, 1])]
 let s:mw_min = min([s:mw_min, s:mw_max])
+let s:mw_res =
+\ s:mw =~ 'results:[^,]\+' ? str2nr(matchstr(s:mw, 'results:\zs\d\+'))
+\ : min([s:mw_max, &lines])
+let s:mw_res = max([s:mw_res, 1])
 endf
 "}}}1
 " * Open & Close {{{1
@@ -576,7 +580,7 @@ fu! s:Update(str)
 let s:martcs = &scs && str =~ '\u' ? '\C' : ''
 let pat = s:matcher == {} ? s:SplitPattern(str) : str
 let lines = s:nolim == 1 && empty(str) ? copy(g:ctrlp_lines)
-\ : s:MatchedItems(g:ctrlp_lines, pat, s:winmaxh)
+\ : s:MatchedItems(g:ctrlp_lines, pat, s:mw_res)
 cal s:Render(lines, pat)
 endf
 
@@ -1605,8 +1609,7 @@ endf
 fu! ctrlp#syntax()
 if ctrlp#nosy() | retu | en
 for [ke, va] in items(s:hlgrps) | cal ctrlp#hicheck('CtrlP'.ke, va) | endfo
-if !hlexists('CtrlPLinePre')
-\ && synIDattr(synIDtrans(hlID('Normal')), 'bg') !~ '^-1$\|^$'
+if synIDattr(synIDtrans(hlID('Normal')), 'bg') !~ '^-1$\|^$'
 sil! exe 'hi CtrlPLinePre '.( has("gui_running") ? 'gui' : 'cterm' ).'fg=bg'
 en
 sy match CtrlPNoEntries '^ == NO ENTRIES ==$'

sources_non_forked/ctrlp.vim/autoload/ctrlp/bookmarkdir.vim

@@ -112,12 +112,12 @@ fu! ctrlp#bookmarkdir#accept(mode, str)
 en
 endf
 
-fu! ctrlp#bookmarkdir#add(dir)
+fu! ctrlp#bookmarkdir#add(dir, ...)
 let str = 'Directory to bookmark: '
 let cwd = a:dir != '' ? a:dir : s:getinput(str, getcwd(), 'dir')
 if cwd == '' | retu | en
 let cwd = fnamemodify(cwd, ':p')
-let name = s:getinput('Bookmark as: ', cwd)
+let name = a:0 && a:1 != '' ? a:1 : s:getinput('Bookmark as: ', cwd)
 if name == '' | retu | en
 let name = tr(name, '', ' ')
 cal s:savebookmark(name, cwd)

sources_non_forked/ctrlp.vim/autoload/ctrlp/buffertag.vim

@@ -62,6 +62,7 @@ let s:types = {
 \ 'lisp' : '%slisp%slisp%sf',
 \ 'lua' : '%slua%slua%sf',
 \ 'make' : '%smake%smake%sm',
+\ 'ocaml' : '%socaml%socaml%scmMvtfCre',
 \ 'pascal' : '%spascal%spascal%sfp',
 \ 'perl' : '%sperl%sperl%sclps',
 \ 'php' : '%sphp%sphp%scdvf',

sources_non_forked/ctrlp.vim/autoload/ctrlp/tag.vim

@@ -22,32 +22,36 @@ cal add(g:ctrlp_ext_vars, {
 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 [tg, ofname] = split(a:str, '\t\+\ze[^\t]\+$')
 let tgs = taglist('^'.tg.'$')
 if len(tgs) < 2
-retu [1, 1]
+retu [0, 0, 0, 0]
 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')
+let fname = expand(fnamemodify(simplify(ofname), ':s?^[.\/]\+??:p:.'), 1)
+let [fnd, cnt, pos, ctgs, otgs] = [0, 0, 0, [], []]
+for tgi in tgs
+let lst = bname == fnamemodify(tgi["filename"], ':p') ? 'ctgs' : 'otgs'
+cal call('add', [{lst}, tgi])
+endfo
+let ntgs = ctgs + otgs
+for tgi in ntgs
+let cnt += 1
+let fulname = fnamemodify(tgi["filename"], ':p')
 if stridx(fulname, fname) >= 0
 \ && strlen(fname) + stridx(fulname, fname) == strlen(fulname)
 let fnd += 1
-let pos = ct
+let pos = cnt
 en
-if fnd > 1 | brea | en
 endfo
-retu [fnd, pos]
+let cnt = 0
+for tgi in ntgs
+let cnt += 1
+if tgi["filename"] == ofname
+let [fnd, pos] = [0, cnt]
+en
+endfo
+retu [1, fnd, pos, len(ctgs)]
 endf
 
 fu! s:filter(tags)
@@ -89,27 +93,33 @@ endf
 fu! ctrlp#tag#accept(mode, str)
 cal ctrlp#exit()
 let str = matchstr(a:str, '^[^\t]\+\t\+[^\t]\+\ze\t')
-let [tg, fnd] = [split(str, '^[^\t]\+\zs\t')[0], s:findcount(str)]
+let [tg, fdcnt] = [split(str, '^[^\t]\+\zs\t')[0], s:findcount(str)]
 let cmds = {
 \ 't': ['tab sp', 'tab stj'],
 \ 'h': ['sp', 'stj'],
 \ 'v': ['vs', 'vert stj'],
 \ 'e': ['', 'tj'],
 \ }
-let cmd = fnd[0] == 1 ? cmds[a:mode][0] : cmds[a:mode][1]
+let utg = fdcnt[3] < 2 && fdcnt[0] == 1 && fdcnt[1] == 1
+let cmd = !fdcnt[0] || utg ? cmds[a:mode][0] : cmds[a:mode][1]
 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 !fdcnt[0] || utg
 if cmd != ''
 exe cmd
 en
 let save_cst = &cst
 set cst&
-cal feedkeys(":".fnd[1]."ta ".tg."\r", 'nt')
+cal feedkeys(":".( utg ? fdcnt[2] : "" )."ta ".tg."\r", 'nt')
 let &cst = save_cst
 el
-cal feedkeys(":".cmd." ".tg."\r", 'nt')
+let ext = ""
+if fdcnt[1] < 2 && fdcnt[2]
+let [sav_more, &more] = [&more, 0]
+let ext = fdcnt[2]."\r".":let &more = ".sav_more."\r"
+en
+cal feedkeys(":".cmd." ".tg."\r".ext, 'nt')
 en
 cal ctrlp#setlcdir()
 endf

sources_non_forked/ctrlp.vim/doc/ctrlp.txt

@@ -123,7 +123,7 @@ heights of the match window: >
  let g:ctrlp_match_window = ''
 <
 Example: >
- let g:ctrlp_match_window = 'bottom,order:btt,min:1,max:10'
+ let g:ctrlp_match_window = 'bottom,order:btt,min:1,max:10,results:10'
 <
 The position: (default: bottom)
  top - show the match window at the top of the screen.
@@ -137,6 +137,9 @@ The minimum and maximum heights:
  min:{n} - show minimum {n} lines (default: 1).
  max:{n} - show maximum {n} lines (default: 10).
 
+The maximum number of results:
+ results:{n} - list maximum {n} results (default: sync with max height).
+
 Note: When a setting isn't set, its default value will be used.
 
  *'g:ctrlp_switch_buffer'*
@@ -1285,6 +1288,8 @@ Special thanks:~
  * Christopher Fredén <github.com/icetan>
  * Zahary Karadjov <github.com/zah>
  * Jo De Boeck <github.com/grimpy>
+ * Rudi Grinberg <github.com/rgrinberg>
+ * Timothy Mellor <github.com/mellort>
 
 ===============================================================================
 CHANGELOG *ctrlp-changelog*

sources_non_forked/vim-snipmate/Contributors.md

@@ -30,6 +30,7 @@ additional contributions from:
 * [radicalbit](https://github.com/radicalbit)
 * [redpill](https://github.com/redpill)
 * [robhudson](https://github.com/robhudson)
+* [Shraymonks](https://github.com/shraymonks)
 * [sickill](https://github.com/sickill)
 * [statik](https://github.com/statik)
 * [steveno](https://github.com/steveno)

sources_non_forked/vim-snipmate/addon-info.json

@@ -8,5 +8,5 @@
  "vim-addon-mw-utils": {},
  "tlib": {}
  },
- "description" : "snipMate.vim aims to be a concise vim script that implements some of TextMate's snippets features in Vim. See README.markdown to learn about the features this fork adds"
+ "description" : "snipMate.vim aims to be a concise vim script that implements some of TextMate's snippets features in Vim. See README.md to learn about the features this fork adds"
 }

sources_non_forked/vim-snipmate/autoload/snipMate.vim

@@ -7,7 +7,7 @@ let s:c = g:snipMate
 try
 call tlib#input#List('mi', '', [])
 catch /.*/
-echoe "you're missing tlib. See install instructions at ".expand('<sfile>:h:h').'/README.rst'
+echoe "you're missing tlib. See install instructions at ".expand('<sfile>:h:h').'/README.md'
 endtry
 
 " match $ which doesn't follow a \
@@ -121,8 +121,9 @@ endfunction
 fun! s:ProcessSnippet(snip)
 let snippet = a:snip
 
-if exists('g:snipmate_content_visual')
-let visual = g:snipmate_content_visual | unlet g:snipmate_content_visual
+if exists('b:snipmate_content_visual')
+let visual = b:snipmate_content_visual
+unlet b:snipmate_content_visual
 else
 let visual = ''
 endif
@@ -167,6 +168,18 @@ fun! s:ProcessSnippet(snip)
 let i += 1
 endw
 
+" Add ${0} tab stop if found
+if snippet =~ s:d . '{0'
+let snippet = substitute(snippet, s:d.'{0', '${'.i, '')
+let s = matchstr(snippet, s:d.'{'.i.':\zs.\{-}\ze}')
+if s != ''
+let snippet = substitute(snippet, s:d.'0', '$'.i, 'g')
+let snippet = substitute(snippet, s:d.i, s.'&', 'g')
+endif
+else
+let snippet .= '${'.i.'}'
+endif
+
 if &et " Expand tabs to spaces if 'expandtab' is set.
 return substitute(snippet, '\t', repeat(' ', &sts ? &sts : &sw), 'g')
 endif