Add "g:pymode_options_*" stuff

klen · klen · commit b8cce8639f8e · 2011-10-28T13:49:13.000+04:00
diff --git a/Changelog.rst b/Changelog.rst
@@ -1,6 +1,11 @@
 Changelog
 =========
 
+## 2011-10-28 0.3.2
+-------------------
+* Add 'g:pymode_options_*' stuff, for ability
+  to disable default pymode options for python buffers
+
 ## 2011-10-27 0.3.1
 -------------------
 * Add 'g:pymode_rope_always_show_complete_menu' option
diff --git a/README.rst b/README.rst
@@ -168,7 +168,14 @@ Default values: ::
     " Auto fix vim python paths if virtualenv enabled
     let g:pymode_virtualenv = 1
 
-.. note:: See also :help ropevim.txt
+    " Set default pymode python indent options
+    let g:pymode_options_indent = 1
+
+    " Set default pymode python fold options
+    let g:pymode_options_fold = 1
+
+    " Set default pymode python other options
+    let g:pymode_options_other = 1
 
 
 Default keys
@@ -205,7 +212,7 @@ PyLintToggle   Enable, disable pylint
 -------------- -------------
 PyLint         Check current buffer
 -------------- -------------
-Pyrun          Check current buffer
+Pyrun          Run current buffer in python
 ============== =============
 
 .. note:: See also :help ropevim.txt
diff --git a/doc/pymode.txt b/doc/pymode.txt
@@ -72,6 +72,15 @@ PythonMode. These options should be set in your vimrc.
 
 |'pymode_utils_whitespaces'|        Remove unused whitespaces
 
+|'pymode_options_indent'|           Set default pymode options for
+                                  python indentation
+
+|'pymode_options_fold'|             Set default pymode options for
+                                  python folding
+
+|'pymode_options_other'|            Set default pymode options for
+                                  python codding
+
 
         Note:
         Also see |ropevim.txt|
@@ -214,6 +223,49 @@ Default: 1.
 
 Autoremove unused whitespaces
 
+------------------------------------------------------------------------------
+                                                       *'pymode_options_indent'*
+Values: 0 or 1.
+Default: 1.
+
+If this option is set to 1, pymode enable next options for python buffers: >
+
+    setlocal cinwords=if,elif,else,for,while,try,except,finally,def,class
+    setlocal cindent
+    setlocal tabstop=4
+    setlocal softtabstop=4
+    setlocal shiftwidth=4
+    setlocal shiftround
+    setlocal smartindent
+    setlocal smarttab
+    setlocal expandtab
+    setlocal autoindent
+<
+------------------------------------------------------------------------------
+                                                         *'pymode_options_fold'*
+Values: 0 or 1.
+Default: 1.
+
+If this option is set to 1, pymode enable next options for python buffers: >
+
+    setlocal foldlevelstart=99
+    setlocal foldlevel=99
+    setlocal foldmethod=indent
+<
+------------------------------------------------------------------------------
+                                                        *'pymode_options_other'*
+Values: 0 or 1.
+Default: 1.
+
+If this option is set to 1, pymode enable next options for python buffers: >
+
+    setlocal complete+=t
+    setlocal formatoptions-=t
+    setlocal number
+    setlocal nowrap
+    setlocal textwidth=80
+<
+
 
 ==============================================================================
 3. Default Keys ~
diff --git a/ftplugin/python/pymode.vim b/ftplugin/python/pymode.vim
@@ -2,25 +2,35 @@ if helpers#SafeVar('b:pymode', 1)
     finish
 endif
 
-" Python Options
-setlocal complete+=t
-setlocal cinwords=if,elif,else,for,while,try,except,finally,def,class
-setlocal cindent
-setlocal foldlevelstart=99
-setlocal foldlevel=99
-setlocal foldmethod=indent
-setlocal formatoptions-=t
-setlocal nowrap
-setlocal number
-setlocal textwidth=80
-setlocal tabstop=4
-setlocal softtabstop=4
-setlocal shiftwidth=4
-setlocal shiftround
-setlocal smartindent
-setlocal smarttab
-setlocal expandtab
-setlocal autoindent
+" Python indent options
+if !helpers#SafeVar('g:pymode_options_indent', 1) || g:pymode_options_indent
+    setlocal cinwords=if,elif,else,for,while,try,except,finally,def,class
+    setlocal cindent
+    setlocal tabstop=4
+    setlocal softtabstop=4
+    setlocal shiftwidth=4
+    setlocal shiftround
+    setlocal smartindent
+    setlocal smarttab
+    setlocal expandtab
+    setlocal autoindent
+endif
+
+" Python fold options
+if !helpers#SafeVar('g:pymode_options_fold', 1) || g:pymode_options_fold
+    setlocal foldlevelstart=99
+    setlocal foldlevel=99
+    setlocal foldmethod=indent
+endif
+      
+" Python other options
+if !helpers#SafeVar('g:pymode_options_other', 1) || g:pymode_options_other
+    setlocal complete+=t
+    setlocal formatoptions-=t
+    setlocal number
+    setlocal nowrap
+    setlocal textwidth=80
+endif
 
 " Fix path for project
 if g:pymode
