m-vim_plugins/vim-fugitive
1
0
Fork 0
mirror of https://github.com/tpope/vim-fugitive.git synced 2025-11-12 05:13:53 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't default :Gedit to cwd in empty window

Browse Source
This commit is contained in:
Tim Pope
2022-06-28 15:20:18 -04:00
parent 09dfed092a
commit 69ead802d7
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
autoload/fugitive.vim
View File

@@ -1895,8 +1895,8 @@ function! s:Generate(object, ...) abort
elseif a:object ==# ':/' elseif a:object ==# ':/'
return len(dir) ? s:VimSlash(s:DirUrlPrefix(dir) . '0') : '.' return len(dir) ? s:VimSlash(s:DirUrlPrefix(dir) . '0') : '.'
endif endif
let file = matchstr(a:object, '^\%(:\d:\|[^:]*:\)\zs.*') let file = matchstr(a:object, '^\%(:\d:\|[^:]*:\)\=\zs.*')
return fnamemodify(s:VimSlash(len(file) ? file : a:object), ':p') return empty(file) ? '' : fnamemodify(s:VimSlash(file), ':p')
endfunction endfunction
function! s:DotRelative(path, ...) abort function! s:DotRelative(path, ...) abort
@@ -2027,7 +2027,7 @@ function! s:Expand(rev, ...) abort
let file = len(expand('%')) ? a:rev[-2:-1] . ':%' : '%' let file = len(expand('%')) ? a:rev[-2:-1] . ':%' : '%'
elseif a:rev =~# '^>\%(:\=/\)\=$' elseif a:rev =~# '^>\%(:\=/\)\=$'
let file = '%' let file = '%'
elseif a:rev =~# '^>[> ]\@!' && @% !~# '^fugitive:' && s:Slash(@%) =~# '://' elseif a:rev =~# '^>[> ]\@!' && @% !~# '^fugitive:' && s:Slash(@%) =~# '://\|^$'
let file = '%' let file = '%'
elseif a:rev ==# '>:' elseif a:rev ==# '>:'
let file = empty(s:DirCommitFile(@%)[0]) ? ':0:%' : '%' let file = empty(s:DirCommitFile(@%)[0]) ? ':0:%' : '%'
@@ -5994,7 +5994,7 @@ function! s:OpenParse(string, wants_cmd) abort
break break
endif endif
endwhile endwhile
if empty(args) && !empty(@%) if empty(args)
let args = ['>:'] let args = ['>:']
endif endif
let dir = s:Dir() let dir = s:Dir()
@@ -6099,17 +6099,14 @@ function! fugitive#Open(cmd, bang, mods, arg, ...) abort
endif endif
let mods = s:Mods(a:mods) let mods = s:Mods(a:mods)
if a:cmd ==# 'edit' || a:cmd ==# 'drop'
call s:BlurStatus()
endif
try try
let [file, pre] = s:OpenParse(a:arg, 1) let [file, pre] = s:OpenParse(a:arg, 1)
catch /^fugitive:/ catch /^fugitive:/
return 'echoerr ' . string(v:exception) return 'echoerr ' . string(v:exception)
endtry endtry
if file !~# '^\a\a\+:' && !(has('win32') && file =~# '^\a:/$')
let file = substitute(file, '.\zs' . (has('win32') ? '[\/]' : '/') . '$', '', '')
endif
if a:cmd ==# 'edit' || a:cmd ==# 'drop'
call s:BlurStatus()
endif
return mods . a:cmd . pre . ' ' . s:fnameescape(file) return mods . a:cmd . pre . ' ' . s:fnameescape(file)
endfunction endfunction