aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

runtime(netrw): Don't change global options (#13910)

Browse Source 
Originally reported at: https://github.com/vim-jp/issues/issues/1428
'isk' was unintentionally changed by netrw, regression
introduced in Commit: 71badf9547e8f89571b9a095183671cbb333d528

Signed-off-by: Ken Takata <kentkt@csc.jp>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
K.Takata 2024-01-25 04:10:19 +09:00 committed by GitHub
parent e1ddc2d587
commit a262d3f41b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
runtime/autoload/netrw.vim
View File

@ -2020,7 +2020,7 @@ fun! NetrwStatusLine()
if !exists("w:netrw_explore_bufnr") || w:netrw_explore_bufnr != bufnr("%") || !exists("w:netrw_explore_line") || w:netrw_explore_line != line(".") || !exists("w:netrw_explore_list") if !exists("w:netrw_explore_bufnr") || w:netrw_explore_bufnr != bufnr("%") || !exists("w:netrw_explore_line") || w:netrw_explore_line != line(".") || !exists("w:netrw_explore_list")
" restore user's status line " restore user's status line
let &stl = s:netrw_users_stl let &l:stl = s:netrw_users_stl
let &laststatus = s:netrw_users_ls let &laststatus = s:netrw_users_ls
if exists("w:netrw_explore_bufnr")|unlet w:netrw_explore_bufnr|endif if exists("w:netrw_explore_bufnr")|unlet w:netrw_explore_bufnr|endif
if exists("w:netrw_explore_line") |unlet w:netrw_explore_line |endif if exists("w:netrw_explore_line") |unlet w:netrw_explore_line |endif
@ -2817,7 +2817,7 @@ fun! netrw#NetWrite(...) range
if a:firstline == 1 && a:lastline == line("$") if a:firstline == 1 && a:lastline == line("$")
" restore modifiability; usually equivalent to set nomod " restore modifiability; usually equivalent to set nomod
let &mod= mod let &l:mod= mod
" call Decho(" ro=".&l:ro." ma=".&l:ma." mod=".&l:mod." wrap=".&l:wrap." (filename<".expand("%")."> win#".winnr()." ft<".&ft.">)",'~'.expand("<slnum>")) " call Decho(" ro=".&l:ro." ma=".&l:ma." mod=".&l:mod." wrap=".&l:wrap." (filename<".expand("%")."> win#".winnr()." ft<".&ft.">)",'~'.expand("<slnum>"))
elseif !exists("leavemod") elseif !exists("leavemod")
" indicate that the buffer has not been modified since last written " indicate that the buffer has not been modified since last written
@ -3006,7 +3006,7 @@ fun! s:NetrwGetFile(readcmd, tfile, method)
setl isk-=/ setl isk-=/
filetype detect filetype detect
" call Decho("..local filetype<".&ft."> for buf#".bufnr()."<".bufname().">") " call Decho("..local filetype<".&ft."> for buf#".bufnr()."<".bufname().">")
let &isk= iskkeep let &l:isk= iskkeep
" call Dredir("ls!","NetrwGetFile (renamed buffer back to remote filename<".rfile."> : expand(%)<".expand("%").">)") " call Dredir("ls!","NetrwGetFile (renamed buffer back to remote filename<".rfile."> : expand(%)<".expand("%").">)")
let line1 = 1 let line1 = 1
let line2 = line("$") let line2 = line("$")
@ -10211,7 +10211,7 @@ fun! s:SetupNetrwStatusLine(statline)
" set up status line (may use User9 highlighting) " set up status line (may use User9 highlighting)
" insure that windows have a statusline " insure that windows have a statusline
" make sure statusline is displayed " make sure statusline is displayed
let &stl=a:statline let &l:stl=a:statline
setl laststatus=2 setl laststatus=2
" call Decho("stl=".&stl,'~'.expand("<slnum>")) " call Decho("stl=".&stl,'~'.expand("<slnum>"))
redraw redraw
@ -10327,7 +10327,7 @@ fun! s:NetrwRemoteFtpCmd(path,listcmd)
setl ff=unix setl ff=unix
" restore settings " restore settings
let &ff= ffkeep let &l:ff= ffkeep
" call Dret("NetrwRemoteFtpCmd") " call Dret("NetrwRemoteFtpCmd")
return return
@ -10364,7 +10364,7 @@ fun! s:NetrwRemoteFtpCmd(path,listcmd)
endif endif
" restore settings " {{{3 " restore settings " {{{3
let &ff= ffkeep let &l:ff= ffkeep
" call Dret("NetrwRemoteFtpCmd") " call Dret("NetrwRemoteFtpCmd")
endfun endfun