Disable syntax from pymodeline

klen · klen · commit dcf559347098 · 2012-07-26T17:01:30.000+04:00
diff --git a/ftplugin/python/pymode.vim b/ftplugin/python/pymode.vim
@@ -2,16 +2,17 @@ if pymode#Default('b:pymode', 1)
     finish
 endif
 
+
+" Parse pymode modeline
+call pymode#Modeline()
+
+
 " Syntax highlight
 if pymode#Option('syntax')
     let python_highlight_all=1
 endif
 
 
-" Parse pymode modeline
-call pymode#Modeline()
-
-
 " Options {{{
 
 " Python indent options
diff --git a/syntax/python.vim b/syntax/python.vim
@@ -1,10 +1,7 @@
 " vim: ft=vim:fdm=marker
 
-" OPTION: g:pymode_syntax -- bool.
-call pymode#Default('g:pymode_syntax', 1)
-
 " DESC: Disable script loading
-if !g:pymode_syntax || pymode#Default('b:current_syntax', 'python')
+if !pymode#Option('syntax') || pymode#Default('b:current_syntax', 'python')
     finish
 endif
 
