From 3ce655f4280f45dfb4151fe651d088b64b28d57f Mon Sep 17 00:00:00 2001
From: David Halter <davidhalter88@gmail.com>
Date: Wed, 28 Aug 2013 15:42:02 +0430
Subject: [PATCH] autocomplete function simplified, #136

---
 autoload/jedi.vim        | 18 ++++++++++++++++++
 ftplugin/python/jedi.vim | 15 +++++++++------
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/autoload/jedi.vim b/autoload/jedi.vim
index d74e114..982dac8 100644
--- a/autoload/jedi.vim
+++ b/autoload/jedi.vim
@@ -169,6 +169,24 @@ function! jedi#_vim_exceptions(str, is_eval)
     return l:result
 endfunction
 
+
+function! jedi#auto_complete_string()
+    if pumvisible()
+        return "\<C-n>"
+    else
+        return "\<C-x>\<C-o>\<C-r>=jedi#auto_complete_opened()\<CR>"
+    end
+endfunction
+
+function! jedi#auto_complete_opened()
+    if pumvisible()
+        return "\<Down>"
+    end
+    return ""
+endfunction
+
+
+
 " ------------------------------------------------------------------------
 " deprecations
 " ------------------------------------------------------------------------
diff --git a/ftplugin/python/jedi.vim b/ftplugin/python/jedi.vim
index 42d6ba9..fccdfc3 100644
--- a/ftplugin/python/jedi.vim
+++ b/ftplugin/python/jedi.vim
@@ -14,11 +14,14 @@ if g:jedi#auto_initialization
         " map ctrl+space for autocompletion
         if g:jedi#completions_command == "<C-Space>"
             " in terminals, <C-Space> sometimes equals <Nul>
-            inoremap <expr> <Nul> pumvisible() \|\| &omnifunc == '' ?
-                    \ "\<lt>C-n>" :
-                    \ "\<lt>C-x>\<lt>C-o><c-r>=pumvisible() ?" .
-                    \ "\"\\<lt>c-n>\\<lt>c-p>\\<lt>c-n>\" :" .
-                    \ "\" \\<lt>bs>\\<lt>C-n>\"\<CR>"
+            "
+            "if g:jedi#popup_select_first
+            "inoremap <expr> <Nul> pumvisible() ?
+            "        \ "<C-n>" :
+            "        \ "<C-x><C-o><c-r>=pumvisible() ?" .
+            "        \ "\"\\<lt>c-n>\\<lt>c-p>\\<lt>c-n>\" :" .
+            "        \ "\" \\<lt>bs>\\<lt>C-n>\"\<CR>"
+            inoremap <expr> <Nul> jedi#auto_complete_string()
         endif
         if g:jedi#completions_command != ""
             execute "inoremap <buffer>".g:jedi#completions_command." <C-X><C-O>"
@@ -59,7 +62,7 @@ end
 if g:jedi#popup_on_dot
     if stridx(&completeopt, 'longest') > -1
         if g:jedi#popup_select_first
-            inoremap <silent> <buffer> . .<C-R>=jedi#do_popup_on_dot() ? "\<lt>C-X>\<lt>C-O>\<lt>C-N>" : ""<CR>
+            inoremap <silent> <buffer> . .<C-R>=jedi#do_popup_on_dot() ? "\<lt>C-X>\<lt>C-O>\<lt>Down>" : ""<CR>
         else
             inoremap <silent> <buffer> . .<C-R>=jedi#do_popup_on_dot() ? "\<lt>C-X>\<lt>C-O>" : ""<CR>
         end