From 4b324646269215b47b61f4e6f1b9fcee3edd72bc Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Wed, 27 Jun 2018 12:52:18 +1200 Subject: Restore 'esckeys' option existence check Now I remember: Neovim doesn't have it. --- vim/vimrc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/vim/vimrc b/vim/vimrc index 72106b0a..7cd795a5 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -64,8 +64,10 @@ else set display=lastline " Just let it run off the screen if not endif -" Don't wait for a key after Escape in insert mode -set noesckeys +" Don't wait for a key after Escape in insert mode (not in Neovim) +if exists('+esckeys') + set noesckeys +endif " Delete comment leaders when joining lines, if supported if v:version > 703 || v:version == 703 && has('patch541') -- cgit v1.2.3 From 4d33458950a6a870d55ed24c89627cea83515800 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Wed, 27 Jun 2018 12:52:35 +1200 Subject: Don't load matchit.vim package if using Neovim --- vim/vimrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vim/vimrc b/vim/vimrc index 7cd795a5..df2219d4 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -279,7 +279,7 @@ nnoremap \z :setlocal spelllang=en_nz spelllang? if &loadplugins " Add packaged matchit.vim, if supported - if has('packages') + if has('packages') && !has('nvim') packadd! matchit endif -- cgit v1.2.3 From 55cd77a19a9a5d9ac91cd0c474ae6f4932030980 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Wed, 27 Jun 2018 12:54:23 +1200 Subject: Set 'laststatus' back to 1 in Neovim --- vim/vimrc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/vim/vimrc b/vim/vimrc index df2219d4..15865b87 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -77,6 +77,11 @@ endif " Don't join lines with two spaces at the end of sentences set nojoinspaces +" Don't show a statusline if there's only one window +if has('nvim') " Neovim changed the default to 2 + set laststatus=1 +endif + " Don't redraw the screen during batch execution set lazyredraw -- cgit v1.2.3