fix python-mode#490

klen · klen · commit 6cd05bd157c8 · 2015-09-11T19:34:40.000+03:00
diff --git a/autoload/pymode.vim b/autoload/pymode.vim
@@ -12,13 +12,6 @@ endfunction "}}}
 " DESC: Import python libs
 fun! pymode#init(plugin_root, paths) "{{{
 
-    if g:pymode_python == 'disable'
-        if g:pymode_warning
-            call pymode#error("Pymode requires vim compiled with +python. Most of features will be disabled.")
-        endif
-        return
-    endif
-
     PymodePython import sys, vim
     PymodePython sys.path.insert(0, vim.eval('a:plugin_root'))
     PymodePython sys.path = vim.eval('a:paths') + sys.path
diff --git a/ftplugin/python/pymode.vim b/ftplugin/python/pymode.vim
@@ -2,15 +2,31 @@ if !g:pymode || pymode#default('b:pymode', 1)
     finish
 endif
 
+if g:pymode_python == 'disable'
+
+    if g:pymode_warning
+        call pymode#error("Pymode requires vim compiled with +python. Most of features will be disabled.")
+    endif
+
+    finish
+
+else
+
+
 let b:pymode_modified = &modified
 
 " Init paths
 if !pymode#default('g:pymode_init', 1)
-    call pymode#init(expand('<sfile>:p:h:h:h'), g:pymode_paths)
-    call pymode#virtualenv#init()
-    call pymode#breakpoint#init()
-    PymodePython from pymode.utils import patch_paths
-    PymodePython patch_paths()
+
+        call pymode#init(expand('<sfile>:p:h:h:h'), g:pymode_paths)
+        call pymode#virtualenv#init()
+        call pymode#breakpoint#init()
+
+        PymodePython from pymode.utils import patch_paths
+        PymodePython patch_paths()
+
+    endif
+
 endif
 
 command! -buffer -nargs=1 PymodeVirtualenv call pymode#virtualenv#activate(<args>)
