Merge branch 'release/0.6.14'

klen · klen · commit 32d586bd18f7 · 2013-03-15T19:05:23.000+08:00
diff --git a/Changelog.rst b/Changelog.rst
@@ -1,7 +1,7 @@
 Changelog
 =========
 
-## 2013-03-16 0.6.13
+## 2013-03-16 0.6.14
 --------------------
 * Update `PEP8` to version 1.4.5;
 * Update `Pylint` to version 0.27.0;
diff --git a/autoload/pymode/breakpoint.vim b/autoload/pymode/breakpoint.vim
@@ -8,13 +8,7 @@ fun! pymode#breakpoint#Set(lnum) "{{{
         normal k
     endif
 
-    " Disable lint
-    let pymode_lint = g:pymode_lint
-    let g:pymode_lint = 0
-
     " Save file
-    if &modifiable && &modified | write | endif	
-
-    let g:pymode_lint = pymode_lint
+    if &modifiable && &modified | noautocmd write | endif	
 
 endfunction "}}}
diff --git a/autoload/pymode/lint.vim b/autoload/pymode/lint.vim
@@ -5,7 +5,7 @@ fun! pymode#lint#Check() "{{{
 
     if &modifiable && &modified
         try
-            write
+            noautocmd write
         catch /E212/
             echohl Error | echo "File modified and I can't save it. Cancel code checking." | echohl None
             return 0
@@ -94,7 +94,7 @@ endfunction " }}}
 fun! pymode#lint#Auto() "{{{
     if &modifiable && &modified
         try
-            write
+            noautocmd write
         catch /E212/
             echohl Error | echo "File modified and I can't save it. Cancel operation." | echohl None
             return 0
diff --git a/autoload/pymode/run.vim b/autoload/pymode/run.vim
@@ -2,7 +2,7 @@
 fun! pymode#run#Run(line1, line2) "{{{
     if &modifiable && &modified
         try
-            write
+            noautocmd write
         catch /E212/
             echohl Error | echo "File modified and I can't save it. Cancel code checking." | echohl None
             return 0
@@ -12,10 +12,12 @@ fun! pymode#run#Run(line1, line2) "{{{
     py sys.stdout, stdout_ = StringIO.StringIO(), sys.stdout
     py sys.stderr, stderr_ = StringIO.StringIO(), sys.stderr
     py enc = vim.eval('&enc')
+    call setqflist([])
     call pymode#WideMessage("Code running.")
     try
-        call setqflist([])
-        py execfile(vim.eval('expand("%s:p")'), {'raw_input': lambda s: vim.eval('input("{0}")'.format(s)), 'input': lambda s: vim.eval('input("{0}")'.format(s))})
+        py context = globals()
+        py context['raw_input'] = context['input'] = lambda s: vim.eval('input("{0}")'.format(s))
+        py execfile(vim.eval('expand("%:p")'), context)
         py out, err = sys.stdout.getvalue().strip(), sys.stderr.getvalue()
         py sys.stdout, sys.stderr = stdout_, stderr_
 
diff --git a/doc/pymode.txt b/doc/pymode.txt
@@ -6,7 +6,7 @@
    (__)   (__)  (__) (_) (_)(_____)(_)\_)   (_/\/\_)(_____)(____/(____)     ~
 
 
-                          Version: 0.6.13
+                          Version: 0.6.14
 
 ==============================================================================
 CONTENTS                                                  *Python-mode-contents*
diff --git a/ftplugin/python/init-pymode.vim b/ftplugin/python/init-pymode.vim
@@ -3,7 +3,7 @@ if exists('did_init_pymode_vim')
 endif
 let did_init_pymode_vim = 1
 
-let g:pymode_version = "0.6.13"
+let g:pymode_version = "0.6.14"
 
 com! PymodeVersion echomsg "Current python-mode version: " . g:pymode_version
 
