Fix run and doc

klen · klen · commit dd05bfce5966 · 2012-02-12T01:33:25.000+04:00
diff --git a/ftplugin/python/pymode.vim b/ftplugin/python/pymode.vim
@@ -52,6 +52,7 @@ if g:pymode_doc
 
     " DESC: Set keys
     exe "nnoremap <silent> <buffer> " g:pymode_doc_key ":call pymode#doc#Show(expand('<cword>'))<CR>"
+    exe "vnoremap <silent> <buffer> " g:pymode_doc_key ":call pymode#doc#Show('<C-R><C-A>')<CR>"
 
 endif
 
@@ -115,10 +116,11 @@ endif
 if g:pymode_run
 
     " DESC: Set commands
-    command! -buffer -nargs=0 Pyrun call pymode#run#Run()
+    command! -buffer -nargs=0 -range=% Pyrun call pymode#run#Run(<f-line1>, <f-line2>)
 
     " DESC: Set keys
     exe "nnoremap <silent> <buffer> " g:pymode_run_key ":Pyrun<CR>"
+    exe "vnoremap <silent> <buffer> " g:pymode_run_key ":Pyrun<CR>"
 
 endif
 
diff --git a/plugin/pymode.vim b/plugin/pymode.vim
@@ -1,4 +1,4 @@
-let g:pymode_version = "0.5.7"
+let g:pymode_version = "0.5.8"
 
 com! PymodeVersion echomsg "Current python-mode version: " . g:pymode_version
 
@@ -11,10 +11,11 @@ endif
 " DESC: Check python support
 if !has('python')
     echoerr expand("<sfile>:t") . " required vim compiled with +python."
-    echoerr "Pymode rope, pylint and virtualenv plugins will be disabled."
-    let g:pymode_lint = 0
-    let g:pymode_rope = 0
-    let g:pymode_path = 0
+    let g:pymode_lint       = 0
+    let g:pymode_rope       = 0
+    let g:pymode_path       = 0
+    let g:pymode_doc        = 0
+    let g:pymode_run        = 0
     let g:pymode_virtualenv = 0
 endif
 
@@ -179,10 +180,6 @@ endif
 
 if !pymode#Default("g:pymode_doc", 1) || g:pymode_doc
 
-    if !pymode#CheckProgram("pydoc", "or disable pymode_doc.")
-        let g:pymode_doc = 0
-    endif
-
     " OPTION: g:pymode_doc_key -- string. Key for show python documantation.
     call pymode#Default("g:pymode_doc_key", "K")
 
@@ -216,11 +213,7 @@ endif
 
 if !pymode#Default("g:pymode_run", 1) || g:pymode_run
 
-    if !pymode#CheckProgram("python", "or disable pymode_run.")
-        let g:pymode_run = 0
-    endif
-
-    " OPTION: g:pymode_doc_key -- string. Key for show python documantation.
+    " OPTION: g:pymode_doc_key -- string. Key for show python documentation.
     call pymode#Default("g:pymode_run_key", "<leader>r")
 
 endif
