Merge branch 'develop' of https://github.com/klen/python-mode into develop

dannywillems · dannywillems · commit bf9bbe553c6c · 2015-09-12T06:00:20.000-04:00
diff --git a/autoload/pymode.vim b/autoload/pymode.vim
@@ -12,13 +12,6 @@ endfunction "}}}
 " DESC: Import python libs
 fun! pymode#init(plugin_root, paths) "{{{
 
-    if g:pymode_python == 'disable'
-        if g:pymode_warning
-            call pymode#error("Pymode requires vim compiled with +python. Most of features will be disabled.")
-        endif
-        return
-    endif
-
     PymodePython import sys, vim
     PymodePython sys.path.insert(0, vim.eval('a:plugin_root'))
     PymodePython sys.path = vim.eval('a:paths') + sys.path
diff --git a/autoload/pymode/lint.vim b/autoload/pymode/lint.vim
@@ -65,9 +65,7 @@ fun! pymode#lint#check() "{{{
 
     call g:PymodeSigns.refresh(loclist)
 
-    if g:pymode_lint_cwindow
-        call loclist.show()
-    endif
+    call loclist.show()
 
     call pymode#lint#show_errormessage()
     call pymode#wide_message('Found errors and warnings: ' . len(loclist._loclist))
diff --git a/autoload/pymode/run.vim b/autoload/pymode/run.vim
@@ -43,8 +43,6 @@ let s:efm .= '%-G%.%#'
 
 PymodePython from pymode.run import run_code
 
-call pymode#tools#loclist#init()
-
 
 " DESC: Run python code
 fun! pymode#run#code_run(line1, line2) "{{{
@@ -88,10 +86,7 @@ fun! pymode#run#code_run(line1, line2) "{{{
             call setqflist(qflist)
         endif
 
-        let loclist = g:PymodeLocList.current()
-        let loclist._loclist = getqflist()
-        let loclist._title = "Run errors"
-        call loclist.show()
+        call pymode#quickfix_open(0, g:pymode_quickfix_maxheight, g:pymode_quickfix_maxheight, 0)
 
         let &efm = l:_efm
 
diff --git a/autoload/pymode/tools/loclist.vim b/autoload/pymode/tools/loclist.vim
@@ -68,7 +68,7 @@ fun! g:PymodeLocList.show() "{{{
     call setloclist(0, self._loclist)
     if self.is_empty()
         lclose
-    else
+    elseif g:pymode_lint_cwindow
         let num = winnr()
         lopen
         setl nowrap
diff --git a/ftplugin/python/pymode.vim b/ftplugin/python/pymode.vim
@@ -2,15 +2,31 @@ if !g:pymode || pymode#default('b:pymode', 1)
     finish
 endif
 
+if g:pymode_python == 'disable'
+
+    if g:pymode_warning
+        call pymode#error("Pymode requires vim compiled with +python. Most of features will be disabled.")
+    endif
+
+    finish
+
+else
+
+
 let b:pymode_modified = &modified
 
 " Init paths
 if !pymode#default('g:pymode_init', 1)
-    call pymode#init(expand('<sfile>:p:h:h:h'), g:pymode_paths)
-    call pymode#virtualenv#init()
-    call pymode#breakpoint#init()
-    PymodePython from pymode.utils import patch_paths
-    PymodePython patch_paths()
+
+        call pymode#init(expand('<sfile>:p:h:h:h'), g:pymode_paths)
+        call pymode#virtualenv#init()
+        call pymode#breakpoint#init()
+
+        PymodePython from pymode.utils import patch_paths
+        PymodePython patch_paths()
+
+    endif
+
 endif
 
 command! -buffer -nargs=1 PymodeVirtualenv call pymode#virtualenv#activate(<args>)
