Skip to content

Commit b5d8d23

Browse files
committed
refactor(bufwin_do): buf number instead of name
1 parent 0ba2a21 commit b5d8d23

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

autoload/dirvish.vim

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -323,28 +323,28 @@ func! s:try_visit(bnr, noau) abort
323323
endf
324324

325325
if exists('*win_execute')
326-
" Performs `cmd` in all windows showing `bname`.
327-
func! s:bufwin_do(cmd, bname) abort
328-
call map(filter(getwininfo(), {_,v -> a:bname ==# bufname(v.bufnr)}), {_,v -> win_execute(v.winid, s:noau.' '.a:cmd)})
326+
" Performs `cmd` in all windows showing `bnr`.
327+
func! s:bufwin_do(cmd, bnr) abort
328+
call map(filter(getwininfo(), {_,v -> a:bnr ==# v.bufnr}), {_,v -> win_execute(v.winid, s:noau.' '.a:cmd)})
329329
endf
330330
else
331-
func! s:tab_win_do(tnr, cmd, bname) abort
331+
func! s:tab_win_do(tnr, cmd, bnr) abort
332332
exe s:noau 'tabnext' a:tnr
333333
for wnr in range(1, tabpagewinnr(a:tnr, '$'))
334-
if a:bname ==# bufname(winbufnr(wnr))
334+
if a:bnr ==# winbufnr(wnr)
335335
exe s:noau wnr.'wincmd w'
336336
exe a:cmd
337337
endif
338338
endfor
339339
endf
340340

341-
func! s:bufwin_do(cmd, bname) abort
341+
func! s:bufwin_do(cmd, bnr) abort
342342
let [curtab, curwin, curwinalt, curheight, curwidth, squashcmds] = [tabpagenr(), winnr(), winnr('#'), winheight(0), winwidth(0), filter(split(winrestcmd(), '|'), 'v:val =~# " 0$"')]
343343
for tnr in range(1, tabpagenr('$'))
344344
let [origwin, origwinalt] = [tabpagewinnr(tnr), tabpagewinnr(tnr, '#')]
345345
for bnr in tabpagebuflist(tnr)
346-
if a:bname ==# bufname(bnr)
347-
call s:tab_win_do(tnr, a:cmd, a:bname)
346+
if a:bnr == bnr
347+
call s:tab_win_do(tnr, a:cmd, a:bnr)
348348
exe s:noau origwinalt.'wincmd w|' s:noau origwin.'wincmd w'
349349
break
350350
endif
@@ -364,16 +364,16 @@ else
364364
endif
365365

366366
func! s:buf_render(dir, lastpath) abort
367-
let bname = bufname('%')
367+
let bnr = bufnr('%')
368368
let isnew = empty(getline(1))
369369

370-
if !isdirectory(s:sl(bname))
370+
if !isdirectory(s:sl(bufname('%')))
371371
echoerr 'dirvish: fatal: buffer name is not a directory:' bufname('%')
372372
return
373373
endif
374374

375375
if !isnew
376-
call s:bufwin_do('let w:dirvish["_view"] = winsaveview()', bname)
376+
call s:bufwin_do('let w:dirvish["_view"] = winsaveview()', bnr)
377377
endif
378378

379379
if v:version > 704 || v:version == 704 && has("patch73")
@@ -389,7 +389,7 @@ func! s:buf_render(dir, lastpath) abort
389389
endif
390390

391391
if !isnew
392-
call s:bufwin_do('call winrestview(w:dirvish["_view"])', bname)
392+
call s:bufwin_do('call winrestview(w:dirvish["_view"])', bnr)
393393
endif
394394

395395
if !empty(a:lastpath)

0 commit comments

Comments
 (0)