Merge pull request #475 from dannon/develop

klen · klen · commit a05d77faea3b · 2014-09-07T17:42:50.000+01:00
Add option for disabling colorcolumn &lt;nt&gt;
diff --git a/doc/pymode.txt b/doc/pymode.txt
@@ -115,6 +115,10 @@ python buffers: >
     setlocal commentstring=#%s
     setlocal define=^\s*\\(def\\\\|class\\)
 
+Enable colorcolumn display at max_line_length   *'g:pymode_options_colorcolumn'*
+>
+    let g:pymode_options_colorcolumn = 1
+
 Setup pymode |quickfix| window
 
                     *'g:pymode_quickfix_maxheight'* *'g:pymode_quickfix_minheight'*
diff --git a/ftplugin/python/pymode.vim b/ftplugin/python/pymode.vim
@@ -59,7 +59,7 @@ if g:pymode_options
     endif
     setlocal nowrap
     exe "setlocal textwidth=" . g:pymode_options_max_line_length
-    if exists('+colorcolumn')
+    if g:pymode_options_colorcolumn && exists('+colorcolumn')
         setlocal colorcolumn=+1
     endif
     setlocal commentstring=#%s
diff --git a/plugin/pymode.vim b/plugin/pymode.vim
@@ -48,6 +48,7 @@ call pymode#default("g:pymode_trim_whitespaces", 1)
 " Set recomended python options
 call pymode#default("g:pymode_options", 1)
 call pymode#default("g:pymode_options_max_line_length", 80)
+call pymode#default("g:pymode_options_colorcolumn", 1)
 
 " Minimal height of pymode quickfix window
 call pymode#default('g:pymode_quickfix_maxheight', 6)
