From 51d0c3f341b5d0cd68300e16cc29a97a5783ce02 Mon Sep 17 00:00:00 2001 From: Jeroen Budts Date: Tue, 15 Jan 2013 22:32:15 +0100 Subject: [PATCH] move initialization into ftplugin as it is python specific --- plugin/pymode.vim => ftplugin/python/init-pymode.vim | 8 ++++++-- ftplugin/python/pymode.vim | 2 ++ syntax/python.vim | 2 ++ 3 files changed, 10 insertions(+), 2 deletions(-) rename plugin/pymode.vim => ftplugin/python/init-pymode.vim (98%) diff --git a/plugin/pymode.vim b/ftplugin/python/init-pymode.vim similarity index 98% rename from plugin/pymode.vim rename to ftplugin/python/init-pymode.vim index 4c4e5803..af184b45 100644 --- a/plugin/pymode.vim +++ b/ftplugin/python/init-pymode.vim @@ -1,3 +1,8 @@ +if exists('did_init_pymode_vim') + finish +endif +let did_init_pymode_vim = 1 + let g:pymode_version = "0.6.9" com! PymodeVersion echomsg "Current python-mode version: " . g:pymode_version @@ -43,8 +48,7 @@ python << EOF import sys, vim, os curpath = vim.eval("getcwd()") -libpath = os.path.join(os.path.dirname(os.path.dirname( - vim.eval("expand(':p')"))), 'pylibs') +libpath = os.path.join(vim.eval("expand(':p:h:h:h')"), 'pylibs') sys.path = [os.path.dirname(libpath), libpath, curpath] + vim.eval("g:pymode_paths") + sys.path EOF diff --git a/ftplugin/python/pymode.vim b/ftplugin/python/pymode.vim index 854e51d0..ffcf0803 100644 --- a/ftplugin/python/pymode.vim +++ b/ftplugin/python/pymode.vim @@ -1,3 +1,5 @@ +runtime ftplugin/python/init-pymode.vim + if pymode#Default('b:pymode', 1) finish endif diff --git a/syntax/python.vim b/syntax/python.vim index 2f03511b..f62c60ab 100644 --- a/syntax/python.vim +++ b/syntax/python.vim @@ -1,4 +1,6 @@ " vim: ft=vim:fdm=marker +" +runtime ftplugin/python/init-pymode.vim " DESC: Disable script loading if !pymode#Option('syntax') || pymode#Default('b:current_syntax', 'python')