Skip to content

Commit 391f8b5

Browse files
author
amix
committed
Updated vim plugins
1 parent 48a2c32 commit 391f8b5

82 files changed

Lines changed: 1922 additions & 2663 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎sources_non_forked/ctrlp.vim/autoload/ctrlp.vim‎

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -569,9 +569,14 @@ endf
569569
fu! s:MatchedItems(items, pat, limit)
570570
let exc = exists('s:crfilerel') ? s:crfilerel : ''
571571
let items = s:narrowable() ? s:matched + s:mdata[3] : a:items
572-
if s:matcher != {}
572+
let matcher = s:getextvar('matcher')
573+
if empty(matcher) || type(matcher) != 4 || !has_key(matcher, 'match')
574+
unlet matcher
575+
let matcher = s:matcher
576+
en
577+
if matcher != {}
573578
let argms =
574-
\ has_key(s:matcher, 'arg_type') && s:matcher['arg_type'] == 'dict' ? [{
579+
\ has_key(matcher, 'arg_type') && matcher['arg_type'] == 'dict' ? [{
575580
\ 'items': items,
576581
\ 'str': a:pat,
577582
\ 'limit': a:limit,
@@ -580,7 +585,7 @@ fu! s:MatchedItems(items, pat, limit)
580585
\ 'crfile': exc,
581586
\ 'regex': s:regexp,
582587
\ }] : [items, a:pat, a:limit, s:mmode(), s:ispath, exc, s:regexp]
583-
let lines = call(s:matcher['match'], argms, s:matcher)
588+
let lines = call(matcher['match'], argms, matcher)
584589
el
585590
let lines = s:MatchIt(items, a:pat, a:limit, exc)
586591
en
@@ -1196,7 +1201,7 @@ fu! s:AcceptSelection(action)
11961201
let type = exttype == 'dict' ? exttype : 'list'
11971202
en
11981203
en
1199-
let actargs = type == 'dict' ? [{ 'action': md, 'line': line, 'icr': icr }]
1204+
let actargs = type == 'dict' ? [{ 'action': md, 'line': line, 'icr': icr, 'input': str}]
12001205
\ : [md, line]
12011206
cal call(actfunc, actargs)
12021207
endf
@@ -1873,6 +1878,11 @@ fu! s:highlight(pat, grp)
18731878
en
18741879

18751880
cal matchadd('CtrlPLinePre', '^>')
1881+
elseif !empty(a:pat) && s:regexp &&
1882+
\ exists('g:ctrlp_regex_always_higlight') &&
1883+
\ g:ctrlp_regex_always_higlight
1884+
let pat = substitute(a:pat, '\\\@<!\^', '^> \\zs', 'g')
1885+
cal matchadd(a:grp, ( s:martcs == '' ? '\c' : '\C').pat)
18761886
en
18771887
endf
18781888

@@ -2494,7 +2504,9 @@ endf
24942504
fu! s:getextvar(key)
24952505
if s:itemtype >= len(s:coretypes) && len(g:ctrlp_ext_vars) > 0
24962506
let vars = g:ctrlp_ext_vars[s:itemtype - len(s:coretypes)]
2497-
retu has_key(vars, a:key) ? vars[a:key] : -1
2507+
if has_key(vars, a:key)
2508+
retu vars[a:key]
2509+
en
24982510
en
24992511
retu get(g:, 'ctrlp_' . s:matchtype . '_' . a:key, -1)
25002512
endf

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ fu! s:exectags(cmd)
139139
endf
140140

141141
fu! s:exectagsonfile(fname, ftype)
142-
let [ags, ft] = ['-f - --sort=no --excmd=pattern --fields=nKs --extra= ', a:ftype]
142+
let [ags, ft] = ['-f - --sort=no --excmd=pattern --fields=nKs --extra= --file-scope=yes ', a:ftype]
143143
if type(s:types[ft]) == 1
144144
let ags .= s:types[ft]
145145
let bin = s:bin

‎sources_non_forked/ctrlp.vim/autoload/ctrlp/line.vim‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ let g:loaded_ctrlp_line = 1
1313
cal add(g:ctrlp_ext_vars, {
1414
\ 'init': 'ctrlp#line#init(s:crbufnr)',
1515
\ 'accept': 'ctrlp#line#accept',
16+
\ 'act_farg' : 'dict',
1617
\ 'lname': 'lines',
1718
\ 'sname': 'lns',
1819
\ 'type': 'tabe',
@@ -50,11 +51,17 @@ fu! ctrlp#line#init(bufnr)
5051
retu lines
5152
endf
5253

53-
fu! ctrlp#line#accept(mode, str)
54-
let info = matchlist(a:str, '\t|[^|]\+|\(\d\+\):\(\d\+\)|$')
54+
fu! ctrlp#line#accept(dict)
55+
let mode = a:dict['action']
56+
let str = a:dict['line']
57+
let input = a:dict['input']
58+
let info = matchlist(str, '\t|[^|]\+|\(\d\+\):\(\d\+\)|$')
5559
let bufnr = str2nr(get(info, 1))
5660
if bufnr
57-
cal ctrlp#acceptfile(a:mode, bufnr, get(info, 2))
61+
cal ctrlp#acceptfile(mode, bufnr, get(info, 2))
62+
let @/ = input
63+
call search(input, 'c')
64+
call histadd("search", input)
5865
en
5966
endf
6067

‎sources_non_forked/lightline.vim/LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2013-2016 itchyny
3+
Copyright (c) 2013-2017 itchyny
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

0 commit comments

Comments
 (0)