Fix docs and readme.

klen · klen · commit 577a77c65d2b · 2012-03-13T14:39:15.000+04:00
diff --git a/Changelog.rst b/Changelog.rst
@@ -1,7 +1,7 @@
 Changelog
 =========
 
-## 2012-02-?? 0.6.0
+## 2012-03-?? 0.6.0
 -------------------
 * Add 'pymode_lint_hold' option 
 * Improve pymode loading speed
@@ -10,6 +10,8 @@ Changelog
   Ex. "pep8,pyflakes,mccabe"
 * Add 'pymode_lint_ignore' and 'pymode_lint_select' options 
 * Fix rope keys
+* Fix python motion in visual mode
+* Add folding 'pymode_folding'
 
 ## 2012-02-12 0.5.8
 -------------------
diff --git a/README.rst b/README.rst
@@ -8,19 +8,20 @@ This plugin allow you create python code in vim very easily.
 There is no need to install the pylint_, rope_ or any used python library on your system.
 
 - Python objects and motion (]], 3[[, ]]M, vaC, viM, daC, ciM, ...)
+- Folding of python code
+- Virtualenv support
 - Highlight syntax errors
 - Highlight and auto fix unused imports
+- Many linters (pylint_, pyflakes_, ...) that can be run simultaneously
 - Strong code completion
 - Code refactoring
 - Python documentation
 - Run python code
 - Go to definition
 - Powerful customization
-- Virtualenv support
-- Many linters (pylint_, pyflakes_, ...) that can be run simultaneously
-- And more...
+- And more, more ...
 
-See (old) screencast here: http://t.co/3b0bzeXA (sorry for quality, this is my first screencast)
+See (very old) screencast here: http://t.co/3b0bzeXA (sorry for quality, this is my first screencast)
 
 
 .. contents::
@@ -223,14 +224,38 @@ Default values: ::
     let g:pymode_rope_always_show_complete_menu = 0
 
 
-Other stuff
------------
+Automatically folding of python code
+--------------------------------------
 
 Default values: ::
 
-    " Load python objects and motion
+    " Enable python folding
+    let g:pymode_folding = 1
+
+
+Vim python motions and operators
+--------------------------------
+
+Default values: ::
+
+    " Enable python objects and motion
     let g:pymode_motion = 1
 
+
+Virtualenv support
+------------------
+
+Default values: ::
+
+    " Auto fix vim python paths if virtualenv enabled
+    let g:pymode_virtualenv = 1
+
+
+Other stuff
+-----------
+
+Default values: ::
+
     " Load breakpoints plugin
     let g:pymode_breakpoint = 1
 
@@ -240,15 +265,9 @@ Default values: ::
     " Autoremove unused whitespaces
     let g:pymode_utils_whitespaces = 1
 
-    " Auto fix vim python paths if virtualenv enabled
-    let g:pymode_virtualenv = 1
-
     " 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
 
diff --git a/autoload/pymode/doc.vim b/autoload/pymode/doc.vim
@@ -1,3 +1,6 @@
+" Python-mode search by documentation
+
+
 fun! pymode#doc#Show(word) "{{{
     if a:word == ''
         echoerr "No name/symbol under cursor!"
@@ -13,3 +16,6 @@ fun! pymode#doc#Show(word) "{{{
         wincmd p
     endif
 endfunction "}}}
+
+
+" vim: fdm=marker:fdl=0
diff --git a/autoload/pymode/lint.vim b/autoload/pymode/lint.vim
@@ -1,4 +1,4 @@
-function! pymode#lint#Check()
+fun! pymode#lint#Check()
 
     if !g:pymode_lint | return | endif
 
diff --git a/doc/pymode.txt b/doc/pymode.txt
@@ -81,6 +81,8 @@ PythonMode. These options should be set in your vimrc.
 
 |'pymode_rope'|                     Turns off rope script
 
+|'pymode_folding'|                  Turns on/off python folding
+
 |'pymode_breakpoint'|               Turns off breakpoint script
 
 |'pymode_breakpoint_key'|           Key for breakpoint
@@ -96,9 +98,6 @@ PythonMode. These options should be set in your vimrc.
 |'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
 
@@ -319,16 +318,12 @@ If this option is set to 1, pymode enable next options for python buffers: >
     setlocal autoindent
 <
 ------------------------------------------------------------------------------
-                                                         *'pymode_options_fold'*
+                                                              *'pymode_folding'*
 Values: 0 or 1.
 Default: 1.
 
-If this option is set to 1, pymode enable next options for python buffers: >
+If this option is set to 1, pymode enable python-folding.
 
-    setlocal foldlevelstart=99
-    setlocal foldlevel=99
-    setlocal foldmethod=indent
-<
 ------------------------------------------------------------------------------
                                                         *'pymode_options_other'*
 Values: 0 or 1.

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-function! pymode#lint#Check()`
	`1`	`+fun! pymode#lint#Check()`
`2`	`2`
`3`	`3`	`if !g:pymode_lint \| return \| endif`
`4`	`4`