Begin phasing out <line2>

This commit is contained in:
Tim Pope 2019-07-10 08:21:41 -04:00
parent de3f6d977c
commit bb05732d7f

View File

@ -3411,7 +3411,7 @@ function! s:Grep(cmd,bang,arg) abort
endtry endtry
endfunction endfunction
function! s:Log(type, bang, line1, line2, args) abort function! s:Log(type, bang, line1, count, args) abort
let dir = s:Dir() let dir = s:Dir()
let listnr = a:type =~# '^l' ? 0 : -1 let listnr = a:type =~# '^l' ? 0 : -1
let args = s:SplitExpand(a:args, s:Tree(dir)) let args = s:SplitExpand(a:args, s:Tree(dir))
@ -3426,10 +3426,10 @@ function! s:Log(type, bang, line1, line2, args) abort
let paths = [] let paths = []
endif endif
let path = fugitive#Path(@%, '/', dir) let path = fugitive#Path(@%, '/', dir)
if path =~# '^/\.git\%(/\|$\)\|^$' || a:line2 < 0 if path =~# '^/\.git\%(/\|$\)\|^$' || a:count < 0
let path = '' let path = ''
elseif a:line2 > 0 elseif a:count > 0
call add(args, '-L' . a:line1 . ',' . a:line2 . ':' . path[1:-1]) call add(args, '-L' . a:line1 . ',' . a:count . ':' . path[1:-1])
else else
if empty(paths) if empty(paths)
call add(paths, '--') call add(paths, '--')
@ -3571,12 +3571,12 @@ endfunction
function! s:ReadCommand(line1, line2, range, count, bang, mods, reg, arg, args) abort function! s:ReadCommand(line1, line2, range, count, bang, mods, reg, arg, args) abort
let mods = s:Mods(a:mods) let mods = s:Mods(a:mods)
let after = a:line2 let after = a:count
if a:count < 0 if a:count < 0
let delete = 'silent 1,' . line('$') . 'delete_|' let delete = 'silent 1,' . line('$') . 'delete_|'
let after = line('$') let after = line('$')
elseif a:range == 2 elseif a:range == 2
let delete = 'silent ' . a:line1 . ',' . a:line2 . 'delete_|' let delete = 'silent ' . a:line1 . ',' . a:count . 'delete_|'
else else
let delete = '' let delete = ''
endif endif