mirror of
https://github.com/amix/vimrc
synced 2025-06-16 09:35:01 +08:00
Forgot to check in the rest of the updated plugins :/
This commit is contained in:
@ -1598,11 +1598,20 @@ function! fugitive#repo(...) abort
|
||||
endfunction
|
||||
|
||||
function! s:repo_dir(...) dict abort
|
||||
throw 'fugitive: fugitive#repo().dir() has been replaced by FugitiveGitDir()'
|
||||
if !a:0
|
||||
return self.git_dir
|
||||
endif
|
||||
throw 'fugitive: fugitive#repo().dir("...") has been replaced by FugitiveFind(".git/...")'
|
||||
endfunction
|
||||
|
||||
function! s:repo_tree(...) dict abort
|
||||
throw 'fugitive: fugitive#repo().tree() has been replaced by FugitiveFind(":/")'
|
||||
let tree = s:Tree(self.git_dir)
|
||||
if empty(tree)
|
||||
throw 'fugitive: no work tree'
|
||||
elseif !a:0
|
||||
return tree
|
||||
endif
|
||||
throw 'fugitive: fugitive#repo().tree("...") has been replaced by FugitiveFind(":(top)...")'
|
||||
endfunction
|
||||
|
||||
function! s:repo_bare() dict abort
|
||||
@ -1628,11 +1637,11 @@ function! s:repo_git_command(...) dict abort
|
||||
endfunction
|
||||
|
||||
function! s:repo_git_chomp(...) dict abort
|
||||
throw 'fugitive: fugitive#repo().git_chomp(...) has been replaced by FugitiveExecute(...).stdout'
|
||||
silent return substitute(system(fugitive#ShellCommand(a:000, self.git_dir)), '\n$', '', '')
|
||||
endfunction
|
||||
|
||||
function! s:repo_git_chomp_in_tree(...) dict abort
|
||||
throw 'fugitive: fugitive#repo().git_chomp_in_tree(...) has been replaced by FugitiveExecute(...).stdout'
|
||||
return call(self.git_chomp, a:000, self)
|
||||
endfunction
|
||||
|
||||
function! s:repo_rev_parse(rev) dict abort
|
||||
@ -1642,7 +1651,7 @@ endfunction
|
||||
call s:add_methods('repo',['git_command','git_chomp','git_chomp_in_tree','rev_parse'])
|
||||
|
||||
function! s:repo_config(name) dict abort
|
||||
throw 'fugitive: fugitive#repo().config(...) has been replaced by FugitiveConfigGet(...)'
|
||||
return FugitiveConfigGet(a:name, self.git_dir)
|
||||
endfunction
|
||||
|
||||
call s:add_methods('repo',['config'])
|
||||
@ -2388,7 +2397,7 @@ function! s:GlobComplete(lead, pattern, ...) abort
|
||||
if a:lead ==# '/'
|
||||
return []
|
||||
else
|
||||
let results = glob(a:lead . a:pattern, a:0 ? a:1 : 0, 1)
|
||||
let results = glob(substitute(a:lead . a:pattern, '[\{}]', '\\&', 'g'), a:0 ? a:1 : 0, 1)
|
||||
endif
|
||||
call map(results, 'v:val !~# "/$" && isdirectory(v:val) ? v:val."/" : v:val')
|
||||
call map(results, 'v:val[ strlen(a:lead) : -1 ]')
|
||||
@ -7196,9 +7205,9 @@ function! s:BlameMaps(is_ftplugin) abort
|
||||
call s:Map('n', 'o', ':<C-U>exe <SID>BlameCommit("split")<CR>', '<silent>', ft)
|
||||
call s:Map('n', 'O', ':<C-U>exe <SID>BlameCommit("tabedit")<CR>', '<silent>', ft)
|
||||
call s:Map('n', 'p', ':<C-U>exe <SID>BlameCommit("pedit")<CR>', '<silent>', ft)
|
||||
call s:Map('n', '.', ":<C-U> <C-R>=substitute(<SID>BlameCommitFileLnum()[0],'^$','@','')<CR><Home>", ft)
|
||||
call s:Map('n', '(', "-", ft)
|
||||
call s:Map('n', ')', "+", ft)
|
||||
exe s:Map('n', '.', ":<C-U> <C-R>=substitute(<SID>BlameCommitFileLnum()[0],'^$','@','')<CR><Home>", '', ft)
|
||||
exe s:Map('n', '(', "-", '', ft)
|
||||
exe s:Map('n', ')', "+", '', ft)
|
||||
call s:Map('n', 'A', ":<C-u>exe 'vertical resize '.(<SID>linechars('.\\{-\\}\\ze [0-9:/+-][0-9:/+ -]* \\d\\+)')+1+v:count)<CR>", '<silent>', ft)
|
||||
call s:Map('n', 'C', ":<C-u>exe 'vertical resize '.(<SID>linechars('^\\S\\+')+1+v:count)<CR>", '<silent>', ft)
|
||||
call s:Map('n', 'D', ":<C-u>exe 'vertical resize '.(<SID>linechars('.\\{-\\}\\ze\\d\\ze\\s\\+\\d\\+)')+1-v:count)<CR>", '<silent>', ft)
|
||||
|
Reference in New Issue
Block a user