mirror of
https://github.com/vim/vim.git
synced 2025-11-13 22:54:27 -05:00
patch 9.1.1914: runtime(netrw): wipes unnamed buffers
Problem: runtime(netrw): LocalBrowseCheck() wipes unnamed buffers when
g:netrw_fastbrowse=0 (Carlos Falgueras García)
Solution: Check that bufname() is not empty
fixes: #18740
closes: #18741
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
@@ -13,6 +13,7 @@
|
|||||||
" 2025 Oct 26 by Vim Project fix parsing of remote user names #18611
|
" 2025 Oct 26 by Vim Project fix parsing of remote user names #18611
|
||||||
" 2025 Oct 27 by Vim Project align comment after #18611
|
" 2025 Oct 27 by Vim Project align comment after #18611
|
||||||
" 2025 Nov 01 by Vim Project fix NetrwChgPerm #18674
|
" 2025 Nov 01 by Vim Project fix NetrwChgPerm #18674
|
||||||
|
" 2025 Nov 13 by Vim Project don't wipe unnamed buffers #18740
|
||||||
" Copyright: Copyright (C) 2016 Charles E. Campbell {{{1
|
" Copyright: Copyright (C) 2016 Charles E. Campbell {{{1
|
||||||
" Permission is hereby granted to use and distribute this code,
|
" Permission is hereby granted to use and distribute this code,
|
||||||
" with or without modifications, provided that this copyright
|
" with or without modifications, provided that this copyright
|
||||||
@@ -8315,7 +8316,7 @@ function netrw#LocalBrowseCheck(dirname)
|
|||||||
let ibuf = 1
|
let ibuf = 1
|
||||||
let buflast = bufnr("$")
|
let buflast = bufnr("$")
|
||||||
while ibuf <= buflast
|
while ibuf <= buflast
|
||||||
if bufwinnr(ibuf) == -1 && isdirectory(s:NetrwFile(bufname(ibuf)))
|
if bufwinnr(ibuf) == -1 && !empty(bufname(ibuf)) && isdirectory(s:NetrwFile(bufname(ibuf)))
|
||||||
exe "sil! keepj keepalt ".ibuf."bw!"
|
exe "sil! keepj keepalt ".ibuf."bw!"
|
||||||
endif
|
endif
|
||||||
let ibuf= ibuf + 1
|
let ibuf= ibuf + 1
|
||||||
|
|||||||
@@ -104,7 +104,7 @@ func Test_netrw_parse_ssh_config_entries()
|
|||||||
endfunction
|
endfunction
|
||||||
|
|
||||||
"username containing special-chars"
|
"username containing special-chars"
|
||||||
func Test_netrw_parse_special_char_user ()
|
func Test_netrw_parse_special_char_user()
|
||||||
call s:setup()
|
call s:setup()
|
||||||
let result = TestNetrwCaptureRemotePath('scp://user-01@localhost:2222/test.txt')
|
let result = TestNetrwCaptureRemotePath('scp://user-01@localhost:2222/test.txt')
|
||||||
call assert_equal(result.method, 'scp')
|
call assert_equal(result.method, 'scp')
|
||||||
@@ -114,3 +114,19 @@ func Test_netrw_parse_special_char_user ()
|
|||||||
call assert_equal(result.path, 'test.txt')
|
call assert_equal(result.path, 'test.txt')
|
||||||
call s:cleanup()
|
call s:cleanup()
|
||||||
endfunction
|
endfunction
|
||||||
|
|
||||||
|
func Test_netrw_wipe_empty_buffer_fastpath()
|
||||||
|
let g:netrw_fastbrowse=0
|
||||||
|
packadd netrw
|
||||||
|
call setline(1, 'foobar')
|
||||||
|
let bufnr = bufnr('%')
|
||||||
|
tabnew
|
||||||
|
Explore
|
||||||
|
call search('README.txt', 'W')
|
||||||
|
exe ":norm \<cr>"
|
||||||
|
call assert_equal(4, bufnr('$'))
|
||||||
|
call assert_true(bufexists(bufnr))
|
||||||
|
bw
|
||||||
|
|
||||||
|
unlet! netrw_fastbrowse
|
||||||
|
endfunction
|
||||||
|
|||||||
@@ -729,6 +729,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
1914,
|
||||||
/**/
|
/**/
|
||||||
1913,
|
1913,
|
||||||
/**/
|
/**/
|
||||||
|
|||||||
Reference in New Issue
Block a user