aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Clason <c.clason@uni-graz.at>2024-08-17 11:35:37 +0200
committerChristian Clason <c.clason@uni-graz.at>2024-08-17 13:03:13 +0200
commitde680775454ac3718637314ceb45be97d64edde4 (patch)
treec12607bc357231d78f226e26a884820ad19cd830
parent0c3bdb80bd8d030e74876e9c9d3e9ecc246ee5ff (diff)
downloadrneovim-de680775454ac3718637314ceb45be97d64edde4.tar.gz
rneovim-de680775454ac3718637314ceb45be97d64edde4.tar.bz2
rneovim-de680775454ac3718637314ceb45be97d64edde4.zip
vim-patch:7c75411: runtime(netrw): ErrorMsg() may throw E121
Move variables declaration related: vim/vim#15501 https://github.com/vim/vim/commit/7c754110ff8e0d666d422f1644bc356c8fee7392 Co-authored-by: Damien <141588647+xrandomname@users.noreply.github.com>
-rw-r--r--runtime/autoload/netrw.vim12
1 files changed, 6 insertions, 6 deletions
diff --git a/runtime/autoload/netrw.vim b/runtime/autoload/netrw.vim
index 0a9c13aad9..1042585177 100644
--- a/runtime/autoload/netrw.vim
+++ b/runtime/autoload/netrw.vim
@@ -20,6 +20,7 @@
" 2024 Jul 23 by Vim Project: escape filename before trying to delete it (#15330)
" 2024 Jul 30 by Vim Project: handle mark-copy to same target directory (#12112)
" 2024 Aug 02 by Vim Project: honor g:netrw_alt{o,v} for :{S,H,V}explore (#15417)
+" 2024 Aug 15 by Vim Project: style changes, prevent E121 (#15501)
" }}}
" Former Maintainer: Charles E Campbell
" GetLatestVimScripts: 1075 1 :AutoInstall: netrw.vim
@@ -63,11 +64,6 @@ if exists("s:needspatches")
endif
let g:loaded_netrw = "v173"
-if !exists("s:NOTE")
- let s:NOTE = 0
- let s:WARNING = 1
- let s:ERROR = 2
-endif
let s:keepcpo= &cpo
setl cpo&vim
@@ -221,6 +217,11 @@ if !exists("s:LONGLIST")
call s:NetrwInit("s:MAXLIST" ,4)
endif
+let s:NOTE = 0
+let s:WARNING = 1
+let s:ERROR = 2
+call s:NetrwInit("g:netrw_errorlvl", s:NOTE)
+
" ---------------------------------------------------------------------
" Default option values: {{{2
let g:netrw_localcopycmdopt = ""
@@ -346,7 +347,6 @@ call s:NetrwInit("s:didstarstar",0)
call s:NetrwInit("g:netrw_dirhistcnt" , 0)
call s:NetrwInit("g:netrw_decompress" , '{ ".gz" : "gunzip", ".bz2" : "bunzip2", ".zip" : "unzip", ".tar" : "tar -xf", ".xz" : "unxz" }')
call s:NetrwInit("g:netrw_dirhistmax" , 10)
-call s:NetrwInit("g:netrw_errorlvl" , s:NOTE)
call s:NetrwInit("g:netrw_fastbrowse" , 1)
call s:NetrwInit("g:netrw_ftp_browse_reject", '^total\s\+\d\+$\|^Trying\s\+\d\+.*$\|^KERBEROS_V\d rejected\|^Security extensions not\|No such file\|: connect to address [0-9a-fA-F:]*: No route to host$')
if !exists("g:netrw_ftp_list_cmd")