@@ -1,4 +1,8 @@
-*.pyc
+*.py[cod]
+.vimrc
+*.sw?
+*~
+.DS_Store
+.ropeproject
 tags
 todo.txt
-.ropeproject
 
@@ -1,6 +1,18 @@
 Changelog
 =========
 
+## 2013-03-** 0.6.11
+--------------------
+* Update `PEP8` to version 1.4.5;
+* Update `Pylint` to version 0.27.0;
+* Update `autopep8` to version 0.8.7;
+* Fix breakpoint definition;
+* Update python syntax;
+* Fixed run-time error when output non-ascii in multibyte locale;
+* Move initialization into ftplugin as it is python specific;
+* Pyrex (Cython) files support;
+* Support `raw_input` in run python code;
+
 ## 2012-09-07 0.6.10
 --------------------
 * Dont raise an exception when Logger has no message handler (c) nixon
 
@@ -22,6 +22,7 @@ There is no need to install the pylint_, rope_ or any used python library on you
 - And more, more ...
 
 See (very old) screencast here: http://t.co/3b0bzeXA (sorry for quality, this is my first screencast)
+Another old presentation here: http://www.youtube.com/watch?v=YhqsjUUHj6g
 
 
 .. contents::
@@ -116,6 +117,15 @@ To change this settings, edit your ``~/.vimrc``: ::
     let g:pymode_run_key = 'R'
 
 
+Loading the Plugin
+------------------
+
+Default values: ::
+
+    " Load the whole plugin
+    let g:pymode = 1
+
+
 Show documentation
 ------------------
 
 
@@ -0,0 +1 @@
+runtime after/ftplugin/python.vim
@@ -0,0 +1 @@
+runtime after/indent/python.vim
@@ -10,7 +10,7 @@ fun! pymode#doc#Show(word) "{{{
         py help(vim.eval('a:word'))
         py sys.stdout, out = _, sys.stdout.getvalue()
         call pymode#TempBuffer()
-        py vim.current.buffer.append(out.split('\n'), 0)
+        py vim.current.buffer.append(str(out).split('\n'), 0)
         wincmd p
     endif
 endfunction "}}}
 
@@ -14,6 +14,7 @@ fun! pymode#lint#Check() "{{{
 
     let g:pymode_lint_buffer = bufnr('%')
 
+    py from pymode import lint
     py lint.check_file()
 
 endfunction " }}}
@@ -99,7 +100,9 @@ fun! pymode#lint#Auto() "{{{
             return 0
         endtry
     endif
+    py from pymode import auto
     py auto.fix_current_file()
     cclose
     edit
+    call pymode#WideMessage("AutoPep8 done.")
 endfunction "}}}
@@ -1,16 +1,40 @@
 " DESC: Save file if it modified and run python code
 fun! pymode#run#Run(line1, line2) "{{{
-    if &modifiable && &modified | write | endif	
+    if &modifiable && &modified
+        try
+            write
+        catch /E212/
+            echohl Error | echo "File modified and I can't save it. Cancel code checking." | echohl None
+            return 0
+        endtry
+    endif
     py import StringIO
-    py sys.stdout, _ = StringIO.StringIO(), sys.stdout
+    py sys.stdout, stdout_ = StringIO.StringIO(), sys.stdout
+    py sys.stderr, stderr_ = StringIO.StringIO(), sys.stderr
+    py enc = vim.eval('&enc')
     call pymode#WideMessage("Code running.")
     try
-        py execfile(vim.eval('expand("%s:p")'))
-        py sys.stdout, out = _, sys.stdout.getvalue()
-        call pymode#TempBuffer()
-        py vim.current.buffer.append(out.split('\n'), 0)
-        wincmd p
-        call pymode#WideMessage("")
+        call setqflist([])
+        py execfile(vim.eval('expand("%s:p")'), {'raw_input': lambda s:
+        vim.eval('input("{0}")'.format(s)), 'input': vim.eval('input("{0}")'.format(s))})
+        py out, err = sys.stdout.getvalue().strip(), sys.stderr.getvalue()
+        py sys.stdout, sys.stderr = stdout_, stderr_
+
+        cexpr ""
+        py for x in err.strip().split('\n'): vim.command('caddexpr "' + x.replace('"', r'\"') + '"')
+        let l:oldefm = &efm
+        set efm=%C\ %.%#,%A\ \ File\ \"%f\"\\,\ line\ %l%.%#,%Z%[%^\ ]%\\@=%m
+        call pymode#QuickfixOpen(0, g:pymode_lint_hold, g:pymode_lint_maxheight, g:pymode_lint_minheight, 0)
+        let &efm = l:oldefm
+
+python << EOF
+if out:
+    vim.command("call pymode#TempBuffer()")
+    vim.current.buffer.append([x.encode(enc) for x in out.split('\n')], 0)
+    vim.command("wincmd p")
+else:
+    vim.command('call pymode#WideMessage("No output.")')
+EOF
 
     catch /.*/
 
 
@@ -15,7 +15,7 @@ fun! pymode#virtualenv#Activate() "{{{
 python << EOF
 import sys, vim, os
 
-ve_dir = os.environ['VIRTUAL_ENV']
+ve_dir = vim.eval('$VIRTUAL_ENV')
 ve_dir in sys.path or sys.path.insert(0, ve_dir)
 activate_this = os.path.join(os.path.join(ve_dir, 'bin'), 'activate_this.py')
 
@@ -25,4 +25,7 @@ if not os.path.exists(activate_this):
 
 execfile(activate_this, dict(__file__=activate_this))
 EOF
+
+    call pymode#WideMessage("Activate virtualenv: ".$VIRTUAL_ENV)
+
 endfunction "}}}
@@ -44,6 +44,8 @@ to install the pylint or rope libraries on your system.
 This script provides the following options that can customise the behaviour of
 PythonMode. These options should be set in your vimrc.
 
+|'pymode'|                          Turn off the whole plugin
+
 |'pymode_paths'|                    Additional python paths for pymode
 
 |'pymode_doc'|                      Turns off the documentation script
@@ -142,6 +144,13 @@ Set linters and mccabe complexity.
 
 This changes will work only in current buffer.
 
+------------------------------------------------------------------------------
+                                                                      *'pymode'*
+Values: 0 or 1.
+Default: 1.
+
+If this option is set to 0 then the whole plugin is disabled
+
 ------------------------------------------------------------------------------
                                                                 *'pymode_paths'*
 Values: List of strings
@@ -196,7 +205,7 @@ This option sets code checkers.
 Values: IDs of errors, separated by commas or empty strings
         E.g. "E501,W002", "E2,W" (Skip all Warnings and Errors startswith E2) and etc ~
 
-Default: "E501".
+Default: "".
 
 Skip errors and warnings.
 See also: |'pymode_lint_select'|, |'pymode_lint_config'|