From f4b3636f245fce5f4b246b838c7cdd8a87364123 Mon Sep 17 00:00:00 2001 From: Christian Clason Date: Wed, 31 Jan 2024 09:39:33 +0100 Subject: [PATCH] vim-patch:bdb9d9afba97 runtime(netrw): Use :exec norm! before :call mapping in netrw (vim/vim#12180) fixes: vim/vim#12143 https://github.com/vim/vim/commit/bdb9d9afba9769b1cb9c0b320086142d99034c9a Co-authored-by: user202729 <25191436+user202729@users.noreply.github.com> --- runtime/autoload/netrw.vim | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/runtime/autoload/netrw.vim b/runtime/autoload/netrw.vim index d551095aeb..88a5c3128c 100644 --- a/runtime/autoload/netrw.vim +++ b/runtime/autoload/netrw.vim @@ -6620,14 +6620,14 @@ fun! s:NetrwMaps(islocal) nmap <2-leftmouse> Netrw2Leftmouse imap ILeftmouse imap IMiddlemouse - nno NetrwLeftmouse :call NetrwLeftmouse(1) - nno NetrwCLeftmouse :call NetrwCLeftmouse(1) - nno NetrwMiddlemouse :call NetrwPrevWinOpen(1) - nno NetrwSLeftmouse :call NetrwSLeftmouse(1) - nno NetrwSLeftdrag :call NetrwSLeftdrag(1) + nno NetrwLeftmouse :exec "norm! \leftmouse>"call NetrwLeftmouse(1) + nno NetrwCLeftmouse :exec "norm! \leftmouse>"call NetrwCLeftmouse(1) + nno NetrwMiddlemouse :exec "norm! \leftmouse>"call NetrwPrevWinOpen(1) + nno NetrwSLeftmouse :exec "norm! \leftmouse>"call NetrwSLeftmouse(1) + nno NetrwSLeftdrag :exec "norm! \leftmouse>"call NetrwSLeftdrag(1) nmap Netrw2Leftmouse - - exe 'nnoremap :call NetrwLocalRm("'.mapsafecurdir.'")' - exe 'vnoremap :call NetrwLocalRm("'.mapsafecurdir.'")' + exe 'nnoremap :exec "norm! \leftmouse>"call NetrwLocalRm("'.mapsafecurdir.'")' + exe 'vnoremap :exec "norm! \leftmouse>"call NetrwLocalRm("'.mapsafecurdir.'")' endif exe 'nnoremap :call NetrwLocalRm("'.mapsafecurdir.'")' exe 'nnoremap D :call NetrwLocalRm("'.mapsafecurdir.'")' @@ -6720,22 +6720,22 @@ fun! s:NetrwMaps(islocal) nnoremap NetrwRefresh :call NetrwRefresh(0,NetrwBrowseChgDir(0,'./')) if g:netrw_mousemaps == 1 nmap NetrwLeftmouse - nno NetrwLeftmouse :call NetrwLeftmouse(0) + nno NetrwLeftmouse :exec "norm! \leftmouse>"call NetrwLeftmouse(0) nmap NetrwCLeftmouse - nno NetrwCLeftmouse :call NetrwCLeftmouse(0) + nno NetrwCLeftmouse :exec "norm! \leftmouse>"call NetrwCLeftmouse(0) nmap NetrwSLeftmouse - nno NetrwSLeftmouse :call NetrwSLeftmouse(0) + nno NetrwSLeftmouse :exec "norm! \leftmouse>"call NetrwSLeftmouse(0) nmap NetrwSLeftdrag - nno NetrwSLeftdrag :call NetrwSLeftdrag(0) + nno NetrwSLeftdrag :exec "norm! \leftmouse>"call NetrwSLeftdrag(0) nmap NetrwMiddlemouse - nno NetrwMiddlemouse :call NetrwPrevWinOpen(0) + nno NetrwMiddlemouse :exec "norm! \leftmouse>"call NetrwPrevWinOpen(0) nmap <2-leftmouse> Netrw2Leftmouse nmap Netrw2Leftmouse - imap ILeftmouse imap IMiddlemouse imap ISLeftmouse - exe 'nnoremap :call NetrwRemoteRm("'.mapsafeusermach.'","'.mapsafepath.'")' - exe 'vnoremap :call NetrwRemoteRm("'.mapsafeusermach.'","'.mapsafepath.'")' + exe 'nnoremap :exec "norm! \leftmouse>"call NetrwRemoteRm("'.mapsafeusermach.'","'.mapsafepath.'")' + exe 'vnoremap :exec "norm! \leftmouse>"call NetrwRemoteRm("'.mapsafeusermach.'","'.mapsafepath.'")' endif exe 'nnoremap :call NetrwRemoteRm("'.mapsafeusermach.'","'.mapsafepath.'")' exe 'nnoremap d :call NetrwMakeDir("'.mapsafeusermach.'")'