From 20a63f6c0f58bceb1d9b1e71b612993d82e0fe71 Mon Sep 17 00:00:00 2001
From: Yann Thomas-Gerard <inside@gmail.com>
Date: Wed, 18 Sep 2013 11:24:32 +0200
Subject: [PATCH] Sets our own omnifunc and allows loading of the
 distribution's python ftplugin

---
 after/ftplugin/python/jedi.vim | 3 +++
 ftplugin/python/jedi.vim       | 2 --
 2 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 after/ftplugin/python/jedi.vim

diff --git a/after/ftplugin/python/jedi.vim b/after/ftplugin/python/jedi.vim
new file mode 100644
index 0000000..efc5ec9
--- /dev/null
+++ b/after/ftplugin/python/jedi.vim
@@ -0,0 +1,3 @@
+" We need our own omnifunc, so this overrides the omnifunc set by
+" $VIMRUNTIME/ftplugin/python.vim.
+setlocal omnifunc=jedi#completions
diff --git a/ftplugin/python/jedi.vim b/ftplugin/python/jedi.vim
index d66d911..87c409f 100644
--- a/ftplugin/python/jedi.vim
+++ b/ftplugin/python/jedi.vim
@@ -1,5 +1,3 @@
-let b:did_ftplugin = 1
-
 if !has('python') && !has('python3')
     finish
 endif