From 820bb5004ac00f53f3c87233dc182c43895a496a Mon Sep 17 00:00:00 2001
From: Kevin MacMartin <prurigro@gmail.com>
Date: Thu, 24 Mar 2016 17:04:41 -0400
Subject: [PATCH] Don't enable neocomplete keyboard bindings if neovim is being
 used

---
 vim/config/keyboard.vim | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/vim/config/keyboard.vim b/vim/config/keyboard.vim
index fc845c0..ee4d30a 100644
--- a/vim/config/keyboard.vim
+++ b/vim/config/keyboard.vim
@@ -704,20 +704,22 @@
     "}
 
     "AUTOCOMPLETION:{
-        "neocomplete close popup and save indent
-        inoremap <silent> <CR> <C-r>=<SID>neocache_cr()<CR>
-        function! s:neocache_cr()
-            return pumvisible() ? "\<C-y>" : "\<CR>"
-        endfunction
+        if !has('nvim')
+            "neocomplete close popup and save indent
+            inoremap <silent> <CR> <C-r>=<SID>neocache_cr()<CR>
+            function! s:neocache_cr()
+                return pumvisible() ? "\<C-y>" : "\<CR>"
+            endfunction
 
-        "neocomplete tab completion
-        inoremap <expr><Tab> pumvisible() ? "\<C-n>" : "\<TAB>"
+            "neocomplete tab completion
+            inoremap <expr><Tab> pumvisible() ? "\<C-n>" : "\<TAB>"
 
-        "neocomplete close popup
-        inoremap <expr><Backspace> neocomplete#smart_close_popup()."\<C-h>"
+            "neocomplete close popup
+            inoremap <expr><Backspace> neocomplete#smart_close_popup()."\<C-h>"
 
-        "neocomplete undo completion
-        inoremap <expr><C-u> neocomplete#undo_completion()
+            "neocomplete undo completion
+            inoremap <expr><C-u> neocomplete#undo_completion()
+        endif
     "}
 
     "FORMATTING:{