From 705713597dc7969bdcbd678df6e1e460cafadc9c Mon Sep 17 00:00:00 2001
From: Kevin MacMartin <prurigro@gmail.com>
Date: Sun, 12 Feb 2017 19:08:28 -0500
Subject: [PATCH] Don't add neocomplete.vim to pathogen_disabled twice if
 neovim is being used as well as having lua support disabled, and don't
 include neocomplete keyboard settings if it's disabled because of missing lua
 support

---
 vim/config/keyboard.vim | 2 +-
 vimrc                   | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/vim/config/keyboard.vim b/vim/config/keyboard.vim
index 7e0b0cf..ae7bc37 100644
--- a/vim/config/keyboard.vim
+++ b/vim/config/keyboard.vim
@@ -700,7 +700,7 @@
     "}
 
     "AUTOCOMPLETION:{
-        if !has('nvim')
+        if !has('nvim') && has('lua')
             "neocomplete close popup and save indent
             inoremap <silent> <CR> <C-r>=<SID>neocache_cr()<CR>
             function! s:neocache_cr()
diff --git a/vimrc b/vimrc
index 979fc01..6f783d8 100644
--- a/vimrc
+++ b/vimrc
@@ -41,14 +41,16 @@
     " disable incompatible plugins
     if has('nvim')
         call add(pathogen_disabled, 'vim-fixkey')
+    endif
+
+    if has('nvim') || !has('lua')
         call add(pathogen_disabled, 'neocomplete.vim')
     endif
+
     if !has('python')
         call add(pathogen_disabled, 'MatchTagAlways')
     endif
-    if !has('lua')
-        call add(pathogen_disabled, 'neocomplete.vim')
-    endif
+
     runtime bundle/vim-pathogen/autoload/pathogen.vim
 
     "Load Keymappings: