From 42900bb62f677fd2e0d8a4e5f7d527fe94e06437 Mon Sep 17 00:00:00 2001
From: David Halter <davidhalter88@gmail.com>
Date: Tue, 11 Dec 2012 15:10:03 +0100
Subject: [PATCH] if completeopt = longest is not set, change the default
 behaviour of the popup menu, fixes #32

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

diff --git a/ftplugin/python/jedi.vim b/ftplugin/python/jedi.vim
index fdd511f..7eb025e 100644
--- a/ftplugin/python/jedi.vim
+++ b/ftplugin/python/jedi.vim
@@ -25,7 +25,11 @@ if g:jedi#auto_initialization
 end
 
 if g:jedi#popup_on_dot
-    inoremap <buffer> . .<C-R>=jedi#do_popup_on_dot() ? "\<C-X>\<C-O>" : ""<CR>
+    if stridx(&completeopt, 'longest') > -1
+        inoremap <buffer> . .<C-R>=jedi#do_popup_on_dot() ? "\<lt>C-X>\<lt>C-O>" : ""<CR>
+    else
+        inoremap <buffer> . .<C-R>=jedi#do_popup_on_dot() ? "\<lt>C-X>\<lt>C-O>\<lt>C-P>" : ""<CR>
+    end
 end
 
 if g:jedi#auto_close_doc
diff --git a/jedi b/jedi
index 800f6eb..2d75f50 160000
--- a/jedi
+++ b/jedi
@@ -1 +1 @@
-Subproject commit 800f6eb84b35e5c600eb7b2a887e7913a9cae550
+Subproject commit 2d75f509b71178e50e8825eb0d1200c2888c625e