Skip to content

Commit 5e47cf2

Browse files
committed
netrw.vim: do not save +/* registers
netrw shouldn't be touching these in the first place. fix #11089 ref #6892 ref #6695
1 parent dd0a3cd commit 5e47cf2

File tree

1 file changed

+0
-36
lines changed

1 file changed

+0
-36
lines changed

runtime/autoload/netrw.vim

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -688,10 +688,6 @@ fun! netrw#Explore(indx,dosplit,style,...)
688688
endif
689689

690690
" save registers
691-
if has("clipboard")
692-
sil! let keepregstar = @*
693-
sil! let keepregplus = @+
694-
endif
695691
sil! let keepregslash= @/
696692

697693
" if dosplit
@@ -915,10 +911,6 @@ fun! netrw#Explore(indx,dosplit,style,...)
915911
" call Decho("..case Nexplore with starpat=".starpat.": (indx=".indx.")",'~'.expand("<slnum>"))
916912
if !exists("w:netrw_explore_list") " sanity check
917913
NetrwKeepj call netrw#ErrorMsg(s:WARNING,"using Nexplore or <s-down> improperly; see help for netrw-starstar",40)
918-
if has("clipboard")
919-
sil! let @* = keepregstar
920-
sil! let @+ = keepregplus
921-
endif
922914
sil! let @/ = keepregslash
923915
" call Dret("netrw#Explore")
924916
return
@@ -940,10 +932,6 @@ fun! netrw#Explore(indx,dosplit,style,...)
940932
" call Decho("case Pexplore with starpat=".starpat.": (indx=".indx.")",'~'.expand("<slnum>"))
941933
if !exists("w:netrw_explore_list") " sanity check
942934
NetrwKeepj call netrw#ErrorMsg(s:WARNING,"using Pexplore or <s-up> improperly; see help for netrw-starstar",41)
943-
if has("clipboard")
944-
sil! let @* = keepregstar
945-
sil! let @+ = keepregplus
946-
endif
947935
sil! let @/ = keepregslash
948936
" call Dret("netrw#Explore")
949937
return
@@ -995,10 +983,6 @@ fun! netrw#Explore(indx,dosplit,style,...)
995983
catch /^Vim\%((\a\+)\)\=:E480/
996984
keepalt call netrw#ErrorMsg(s:WARNING,'no files matched pattern<'.pattern.'>',45)
997985
if &hls | let keepregslash= s:ExplorePatHls(pattern) | endif
998-
if has("clipboard")
999-
sil! let @* = keepregstar
1000-
sil! let @+ = keepregplus
1001-
endif
1002986
sil! let @/ = keepregslash
1003987
" call Dret("netrw#Explore : no files matched pattern")
1004988
return
@@ -1031,10 +1015,6 @@ fun! netrw#Explore(indx,dosplit,style,...)
10311015

10321016
if w:netrw_explore_listlen == 0 || (w:netrw_explore_listlen == 1 && w:netrw_explore_list[0] =~ '\*\*\/')
10331017
keepalt NetrwKeepj call netrw#ErrorMsg(s:WARNING,"no files matched",42)
1034-
if has("clipboard")
1035-
sil! let @* = keepregstar
1036-
sil! let @+ = keepregplus
1037-
endif
10381018
sil! let @/ = keepregslash
10391019
" call Dret("netrw#Explore : no files matched")
10401020
return
@@ -1079,10 +1059,6 @@ fun! netrw#Explore(indx,dosplit,style,...)
10791059
if !exists("g:netrw_quiet")
10801060
keepalt NetrwKeepj call netrw#ErrorMsg(s:WARNING,"your vim needs the +path_extra feature for Exploring with **!",44)
10811061
endif
1082-
if has("clipboard")
1083-
sil! let @* = keepregstar
1084-
sil! let @+ = keepregplus
1085-
endif
10861062
sil! let @/ = keepregslash
10871063
" call Dret("netrw#Explore : missing +path_extra")
10881064
return
@@ -1152,10 +1128,6 @@ fun! netrw#Explore(indx,dosplit,style,...)
11521128
" there's no danger of a late FocusGained event on initialization.
11531129
" Consequently, set s:netrw_events to 2.
11541130
let s:netrw_events= 2
1155-
if has("clipboard")
1156-
sil! let @* = keepregstar
1157-
sil! let @+ = keepregplus
1158-
endif
11591131
sil! let @/ = keepregslash
11601132
" call Dret("netrw#Explore : @/<".@/.">")
11611133
endfun
@@ -9559,10 +9531,6 @@ fun! s:NetrwWideListing()
95599531
let newcolstart = w:netrw_bannercnt + fpc
95609532
let newcolend = newcolstart + fpc - 1
95619533
" call Decho("bannercnt=".w:netrw_bannercnt." fpl=".w:netrw_fpl." fpc=".fpc." newcol[".newcolstart.",".newcolend."]",'~'.expand("<slnum>"))
9562-
if has("clipboard")
9563-
sil! let keepregstar = @*
9564-
sil! let keepregplus = @+
9565-
endif
95669534
while line("$") >= newcolstart
95679535
if newcolend > line("$") | let newcolend= line("$") | endif
95689536
let newcolqty= newcolend - newcolstart
@@ -9575,10 +9543,6 @@ fun! s:NetrwWideListing()
95759543
exe "sil! NetrwKeepj ".newcolstart.','.newcolend.'d _'
95769544
exe 'sil! NetrwKeepj '.w:netrw_bannercnt
95779545
endwhile
9578-
if has("clipboard")
9579-
sil! let @*= keepregstar
9580-
sil! let @+= keepregplus
9581-
endif
95829546
exe "sil! NetrwKeepj ".w:netrw_bannercnt.',$s/\s\+$//e'
95839547
NetrwKeepj call histdel("/",-1)
95849548
exe 'nno <buffer> <silent> w :call search(''^.\\|\s\s\zs\S'',''W'')'."\<cr>"

0 commit comments

Comments
 (0)