Fix rope keys

klen · klen · commit 2089fe9e769d · 2012-03-13T18:10:04.000+04:00
diff --git a/Changelog.rst b/Changelog.rst
@@ -1,7 +1,7 @@
 Changelog
 =========
 
-## 2012-03-?? 0.6.0
+## 2012-03-13 0.6.0
 -------------------
 * Add 'pymode_lint_hold' option 
 * Improve pymode loading speed
@@ -12,6 +12,7 @@ Changelog
 * Fix rope keys
 * Fix python motion in visual mode
 * Add folding 'pymode_folding'
+* Warning: 'pymode_lint_checker' now set to 'pyflakes,pep8,mccabe' by default
 
 ## 2012-02-12 0.5.8
 -------------------
diff --git a/README.rst b/README.rst
@@ -134,7 +134,7 @@ Default values: ::
 
     " Switch pylint, pyflakes, pep8, mccabe code-checkers
     " Can have multiply values "pep8,pyflakes,mcccabe"
-    let g:pymode_lint_checker = "pylint"
+    let g:pymode_lint_checker = "pyflakes,pep8,mccabe"
 
     " Skip errors and warnings
     " E.g. "E501,W002", "E2,W" (Skip all Warnings and Errors startswith E2) and etc
@@ -329,6 +329,12 @@ Keys           Command
 -------------- -------------
 **<C-Space>**  Rope autocomplete (g:pymode_rope enabled)
 -------------- -------------
+**<C-c>g**     Rope goto definition  (g:pymode_rope enabled)
+-------------- -------------
+**<C-c>d**     Rope show documentation  (g:pymode_rope enabled)
+-------------- -------------
+**<C-c>f**     Rope find occurrences  (g:pymode_rope enabled)
+-------------- -------------
 **<Leader>r**  Run python  (g:pymode_run enabled)
 -------------- -------------
 **<Leader>b**  Set, unset breakpoint (g:pymode_breakpoint enabled)
@@ -421,7 +427,7 @@ Development of pylint-mode happens at github: https://github.com/klen/python-mod
 Copyright
 =========
 
-Copyright (C) 2011 Kirill Klenov (klen_)
+Copyright (C) 2012 Kirill Klenov (klen_)
 
     **Rope**
         Copyright (C) 2006-2010 Ali Gholami Rudi
diff --git a/doc/pymode.txt b/doc/pymode.txt
@@ -152,7 +152,7 @@ If this option is set to 0 then pylint script is disabled.
 Values: "pylint", "pyflakes", "pep8", "mccabe"
         You can set many checkers. E.g. "pyflakes,pep8,mccabe" ~
 
-Default: "pylint".
+Default: "pyflakes,pep8,mccabe".
 
 This option set code checkers.
 
diff --git a/ftplugin/python/pymode.vim b/ftplugin/python/pymode.vim
@@ -96,10 +96,10 @@ endif
 if g:pymode_rope
 
     " DESC: Set keys
-    exe "noremap <silent> <buffer> " . g:pymode_rope_local_prefix . "g :RopeGotoDefinition<CR>"
-    exe "noremap <silent> <buffer> " . g:pymode_rope_local_prefix . "d :RopeShowDoc<CR>"
-    exe "noremap <silent> <buffer> " . g:pymode_rope_local_prefix . "f :RopeFindOccurrences<CR>"
-    exe "noremap <silent> <buffer> " . g:pymode_rope_local_prefix . "m :emenu Rope . <TAB>"
+    exe "noremap <silent> <buffer> " . g:pymode_rope_short_prefix . "g :RopeGotoDefinition<CR>"
+    exe "noremap <silent> <buffer> " . g:pymode_rope_short_prefix . "d :RopeShowDoc<CR>"
+    exe "noremap <silent> <buffer> " . g:pymode_rope_short_prefix . "f :RopeFindOccurrences<CR>"
+    exe "noremap <silent> <buffer> " . g:pymode_rope_short_prefix . "m :emenu Rope . <TAB>"
     inoremap <silent> <buffer> <S-TAB> <C-R>=RopeLuckyAssistInsertMode()<CR>
 
     let s:prascm = g:pymode_rope_always_show_complete_menu ? "<C-P>" : ""
diff --git a/plugin/pymode.vim b/plugin/pymode.vim
@@ -62,8 +62,8 @@ if !pymode#Default("g:pymode_lint", 1) || g:pymode_lint
     " OPTION: g:pymode_lint_message -- bool. Show current line error message
     call pymode#Default("g:pymode_lint_message", 1)
 
-    " OPTION: g:pymode_lint_checker -- str. Use pylint of pyflakes for check.
-    call pymode#Default("g:pymode_lint_checker", "pylint")
+    " OPTION: g:pymode_lint_checker -- str. Choices are: pylint, pyflakes, pep8, mccabe
+    call pymode#Default("g:pymode_lint_checker", "pyflakes,pep8,mccabe")
 
     " OPTION: g:pymode_lint_config -- str. Path to pylint config file
     call pymode#Default("g:pymode_lint_config", $HOME . "/.pylintrc")
@@ -197,6 +197,9 @@ if !pymode#Default("g:pymode_rope", 1) || g:pymode_rope
     " OPTION: g:pymode_rope_local_prefix -- string.
     call pymode#Default("g:pymode_rope_local_prefix", "<C-c>r")
 
+    " OPTION: g:pymode_rope_short_prefix -- string.
+    call pymode#Default("g:pymode_rope_short_prefix", "<C-c>")
+
     " OPTION: g:pymode_rope_vim_completion -- bool.
     call pymode#Default("g:pymode_rope_vim_completion", 1)
 
