From: Christian Brabandt Date: Fri, 28 Nov 2025 22:37:06 +0000 (+0000) Subject: runtime(netrw): fix undefined variable curwin in s:NetrwMenu() X-Git-Tag: v9.1.1935~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ab090993ad0d9134837a0299a5c7589c66ef4db5;p=thirdparty%2Fvim.git runtime(netrw): fix undefined variable curwin in s:NetrwMenu() fixes: #18829 Signed-off-by: Christian Brabandt --- diff --git a/runtime/pack/dist/opt/netrw/autoload/netrw.vim b/runtime/pack/dist/opt/netrw/autoload/netrw.vim index 2e0b1a68a6..5aa087afbd 100644 --- a/runtime/pack/dist/opt/netrw/autoload/netrw.vim +++ b/runtime/pack/dist/opt/netrw/autoload/netrw.vim @@ -15,6 +15,7 @@ " 2025 Nov 01 by Vim Project fix NetrwChgPerm #18674 " 2025 Nov 13 by Vim Project don't wipe unnamed buffers #18740 " 2025 Nov 18 by Vim Project use UNC paths when using scp and Windows paths #18764 +" 2025 Nov 28 by Vim Project fix undefined variable in *NetrwMenu #18829 " Copyright: Copyright (C) 2016 Charles E. Campbell {{{1 " Permission is hereby granted to use and distribute this code, " with or without modifications, provided that this copyright @@ -6401,6 +6402,7 @@ function s:NetrwMenu(domenu) exe 'sil! menu '.g:NetrwMenuPriority.'.14.8 '.g:NetrwTopLvlMenu.'Marked\ Files.Exe\ Cmdmx mx' exe 'sil! menu '.g:NetrwMenuPriority.'.14.9 '.g:NetrwTopLvlMenu.'Marked\ Files.Move\ To\ Targetmm mm' exe 'sil! menu '.g:NetrwMenuPriority.'.14.10 '.g:NetrwTopLvlMenu.'Marked\ Files.ObtainO O' + exe 'sil! menu '.g:NetrwMenuPriority.'.14.11 '.g:NetrwTopLvlMenu.'Marked\ Files.Printmp mp' exe 'sil! menu '.g:NetrwMenuPriority.'.14.12 '.g:NetrwTopLvlMenu.'Marked\ Files.ReplaceR R' exe 'sil! menu '.g:NetrwMenuPriority.'.14.13 '.g:NetrwTopLvlMenu.'Marked\ Files.Set\ Targetmt mt' exe 'sil! menu '.g:NetrwMenuPriority.'.14.14 '.g:NetrwTopLvlMenu.'Marked\ Files.TagmT mT' @@ -6428,14 +6430,13 @@ function s:NetrwMenu(domenu) let s:netrwcnt = 0 let curwin = winnr() windo if getline(2) =~# "Netrw" | let s:netrwcnt= s:netrwcnt + 1 | endif - endif - exe curwin."wincmd w" + exe curwin."wincmd w" - if s:netrwcnt <= 1 - exe 'sil! unmenu '.g:NetrwTopLvlMenu - sil! unlet s:netrw_menu_enabled + if s:netrwcnt <= 1 + exe 'sil! unmenu '.g:NetrwTopLvlMenu + sil! unlet s:netrw_menu_enabled + endif endif - endif return endif