Merge branch 'feature/neovim-compat' into develop

* feature/neovim-compat:
  Set 'laststatus' back to 1 in Neovim
  Don't load matchit.vim package if using Neovim
  Restore 'esckeys' option existence check

1 files changed, 10 insertions, 3 deletions

diff --git a/vim/vimrc b/vim/vimrc
index 72106b0a..15865b87 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')
@@ -75,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
 
@@ -277,7 +284,7 @@ nnoremap \z :<C-U>setlocal spelllang=en_nz spelllang?<CR>
 if &loadplugins
 
   " Add packaged matchit.vim, if supported
-  if has('packages')
+  if has('packages') && !has('nvim')
     packadd! matchit
   endif