@@ -323,28 +323,28 @@ func! s:try_visit(bnr, noau) abort
323
323
endf
324
324
325
325
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 )})
329
329
endf
330
330
else
331
- func ! s: tab_win_do (tnr, cmd, bname ) abort
331
+ func ! s: tab_win_do (tnr, cmd, bnr ) abort
332
332
exe s: noau ' tabnext' a: tnr
333
333
for wnr in range (1 , tabpagewinnr (a: tnr , ' $' ))
334
- if a: bname == # bufname ( winbufnr (wnr) )
334
+ if a: bnr == # winbufnr (wnr)
335
335
exe s: noau wnr.' wincmd w'
336
336
exe a: cmd
337
337
endif
338
338
endfor
339
339
endf
340
340
341
- func ! s: bufwin_do (cmd, bname ) abort
341
+ func ! s: bufwin_do (cmd, bnr ) abort
342
342
let [curtab, curwin, curwinalt, curheight, curwidth, squashcmds] = [tabpagenr (), winnr (), winnr (' #' ), winheight (0 ), winwidth (0 ), filter (split (winrestcmd (), ' |' ), ' v:val =~# " 0$"' )]
343
343
for tnr in range (1 , tabpagenr (' $' ))
344
344
let [origwin, origwinalt] = [tabpagewinnr (tnr), tabpagewinnr (tnr, ' #' )]
345
345
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 )
348
348
exe s: noau origwinalt.' wincmd w|' s: noau origwin.' wincmd w'
349
349
break
350
350
endif
@@ -364,16 +364,16 @@ else
364
364
endif
365
365
366
366
func ! s: buf_render (dir , lastpath) abort
367
- let bname = bufname (' %' )
367
+ let bnr = bufnr (' %' )
368
368
let isnew = empty (getline (1 ))
369
369
370
- if ! isdirectory (s: sl (bname ))
370
+ if ! isdirectory (s: sl (bufname ( ' % ' ) ))
371
371
echoerr ' dirvish: fatal: buffer name is not a directory:' bufname (' %' )
372
372
return
373
373
endif
374
374
375
375
if ! isnew
376
- call s: bufwin_do (' let w:dirvish["_view"] = winsaveview()' , bname )
376
+ call s: bufwin_do (' let w:dirvish["_view"] = winsaveview()' , bnr )
377
377
endif
378
378
379
379
if v: version > 704 || v: version == 704 && has (" patch73" )
@@ -389,7 +389,7 @@ func! s:buf_render(dir, lastpath) abort
389
389
endif
390
390
391
391
if ! isnew
392
- call s: bufwin_do (' call winrestview(w:dirvish["_view"])' , bname )
392
+ call s: bufwin_do (' call winrestview(w:dirvish["_view"])' , bnr )
393
393
endif
394
394
395
395
if ! empty (a: lastpath )
0 commit comments