move initialization into ftplugin as it is python specific

klen · klen · commit 89de269b5b36 · 2013-03-15T00:55:34.000+08:00
diff --git a/Changelog.rst b/Changelog.rst
@@ -8,7 +8,8 @@ Changelog
 * Update `autopep8` to version 0.8.7;
 * Fix breakpoint definition;
 * Update python syntax;
-* fixed run-time error when output non-ascii in multibyte locale;
+* Fixed run-time error when output non-ascii in multibyte locale;
+* Move initialization into ftplugin as it is python specific;
 
 ## 2012-09-07 0.6.10
 --------------------
diff --git a/ftplugin/python/init-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.11"
 
 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('<sfile>:p')"))), 'pylibs')
+libpath = os.path.join(vim.eval("expand('<sfile>: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
@@ -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
@@ -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')

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+runtime ftplugin/python/init-pymode.vim`
	`2`	`+`
`1`	`3`	`if pymode#Default('b:pymode', 1)`
`2`	`4`	`finish`
`3`	`5`	`endif`