commit 907587f7a3ffe35ebbf358828cfd42e07ddf3fed
parent 38b1e5e7aac9238f93c2caca85d72318489470f9
Author: Caleb Maclennan <caleb@alerque.com>
Date: Tue, 31 Dec 2019 09:40:39 +0300
Fix lint warnings: use the full option name
Diffstat:
4 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/autoload/nerdtree.vim b/autoload/nerdtree.vim
@@ -165,12 +165,12 @@ endfunction
" FUNCTION: nerdtree#exec(cmd, ignoreAll) {{{2
" Same as :exec cmd but, if ignoreAll is TRUE, set eventignore=all for the duration
function! nerdtree#exec(cmd, ignoreAll) abort
- let old_ei = &ei
+ let old_ei = &eventignore
if a:ignoreAll
- set ei=all
+ set eventignore=all
endif
exec a:cmd
- let &ei = old_ei
+ let &eventignore = old_ei
endfunction
" FUNCTION: nerdtree#has_opt(options, name) {{{2
diff --git a/lib/nerdtree/bookmark.vim b/lib/nerdtree/bookmark.vim
@@ -292,7 +292,7 @@ endfunction
" Get the string that should be rendered in the view for this bookmark
function! s:Bookmark.str()
let pathStrMaxLen = winwidth(g:NERDTree.GetWinNum()) - 4 - strdisplaywidth(self.name)
- if &nu
+ if &number
let pathStrMaxLen = pathStrMaxLen - &numberwidth
endif
diff --git a/lib/nerdtree/creator.vim b/lib/nerdtree/creator.vim
@@ -300,11 +300,11 @@ function! s:Creator._setCommonBufOptions()
setlocal nowrap
if g:NERDTreeShowLineNumbers
- setlocal nu
+ setlocal number
else
- setlocal nonu
+ setlocal nonumber
if v:version >= 703
- setlocal nornu
+ setlocal norelativenumber
endif
endif
@@ -330,8 +330,8 @@ endfunction
" FUNCTION: s:Creator._tabpagevar(tabnr, var) {{{1
function! s:Creator._tabpagevar(tabnr, var)
let currentTab = tabpagenr()
- let old_ei = &ei
- set ei=all
+ let old_ei = &eventignore
+ set eventignore=all
exec 'tabnext ' . a:tabnr
let v = -1
@@ -340,7 +340,7 @@ function! s:Creator._tabpagevar(tabnr, var)
endif
exec 'tabnext ' . currentTab
- let &ei = old_ei
+ let &eventignore = old_ei
return v
endfunction
diff --git a/plugin/NERD_tree.vim b/plugin/NERD_tree.vim
@@ -22,9 +22,9 @@ if v:version < 703
endif
let loaded_nerd_tree = 1
-"for line continuation - i.e dont want C in &cpo
-let s:old_cpo = &cpo
-set cpo&vim
+"for line continuation - i.e dont want C in &cpoptions
+let s:old_cpo = &cpoptions
+set cpoptions&vim
"Function: s:initVariable() function {{{2
"This function is used to initialise a given variable to a given value. The
@@ -255,7 +255,7 @@ endfunction
" SECTION: Post Source Actions {{{1
call nerdtree#postSourceActions()
-"reset &cpo back to users setting
-let &cpo = s:old_cpo
+"reset &cpoptions back to users setting
+let &cpoptions = s:old_cpo
" vim: set sw=4 sts=4 et fdm=marker:
