Some updates.

klen · klen · commit 1d3fcbce8712 · 2011-10-17T12:31:19.000+04:00
diff --git a/after/plugin/pymode_breakpoint.vim b/after/plugin/pymode_breakpoint.vim
@@ -2,7 +2,7 @@
 call helpers#SafeVar("g:pymode_breakpoint", 1)
 
 " DESC: Disable script loading
-if ! g:pymode_breakpoint
+if !g:pymode_breakpoint
     finish
 endif
 
diff --git a/after/plugin/pymode_doc.vim b/after/plugin/pymode_doc.vim
@@ -5,7 +5,7 @@ let g:scriptname = expand("<sfile>:t")
 call helpers#SafeVar("g:pymode_doc", 1)
 
 " DESC: Disable script loading
-if g:pymode_doc == 0
+if !g:pymode_doc
     finish
 endif
 
diff --git a/after/plugin/pymode_lint.vim b/after/plugin/pymode_lint.vim
@@ -2,14 +2,7 @@
 call helpers#SafeVar("g:pymode_lint", 1)
 
 " DESC: Disable script loading
-if g:pymode_lint == 0
-    finish
-endif
-
-" DESC: Check python support
-if !has('python')
-    echoerr expand("<sfile>:t") . " required vim compiled with +python."
-    let g:pymode_lint = 0
+if !g:pymode_lint || !g:pymode
     finish
 endif
 
diff --git a/after/plugin/pymode_rope.vim b/after/plugin/pymode_rope.vim
@@ -2,14 +2,7 @@
 call helpers#SafeVar("g:pymode_rope", 1)
 
 " DESC: Disable script loading
-if g:pymode_rope == 0
-    finish
-endif
-
-" DESC: Check python support
-if !has('python')
-    echoerr expand("<sfile>:t") . " required vim compiled with +python."
-    let g:pymode_rope = 0
+if !g:pymode_rope || !g:pymode
     finish
 endif
 
diff --git a/after/plugin/pymode_run.vim b/after/plugin/pymode_run.vim
@@ -5,7 +5,7 @@ let g:scriptname = expand("<sfile>:t")
 call helpers#SafeVar("g:pymode_run", 1)
 
 " DESC: Disable script loading
-if g:pymode_run == 0
+if !g:pymode_run
     finish
 endif
 
diff --git a/plugin/pymode_path.vim b/plugin/pymode_path.vim
@@ -1,7 +1,21 @@
-if exists('g:python_path') || !has('python')
+" OPTION: g:pymode -- bool. Run pymode.
+call helpers#SafeVar("g:pymode", 1)
+
+let g:pymode_path = 0
+
+" DESC: Disable script loading
+if !g:pymode || g:pymode_path
+    finish
+endif
+
+" DESC: Check python support
+if !has('python')
+    echoerr expand("<sfile>:t") . " required vim compiled with +python."
+    echoerr "Pymode pylint and rope plugins will be disabled."
+    let g:pymode = 0
     finish
 endif
-let g:python_path = 1
+let g:pymode_path = 1
 
 python << EOF
 import sys, os, vim
