Minor fix

klen · klen · commit ed513e80d542 · 2011-10-25T21:21:20.000+04:00
diff --git a/Changelog.rst b/Changelog.rst
@@ -1,6 +1,8 @@
 Changelog
 =========
 
+* Add 'g:pymode_rope_always_show_complete_menu' option
+
 ## 2011-10-25 0.3.0
 -------------------
 * Add g:pymode_lint_minheight and g:pymode_lint_maxheight
diff --git a/README.rst b/README.rst
@@ -147,6 +147,8 @@ Default values: ::
 
     let g:pymode_rope_goto_def_newwin = 0
 
+    let g:pymode_rope_always_show_complete_menu = 0
+
 Other stuff
 -----------
 
diff --git a/after/plugin/pymode_rope.vim b/after/plugin/pymode_rope.vim
@@ -49,19 +49,25 @@ call helpers#SafeVar("g:pymode_rope_guess_project", 1)
 " OPTION: g:pymode_rope_goto_def_newwin -- bool.
 call helpers#SafeVar("g:pymode_rope_goto_def_newwin", 0)
 
+" OPTION: g:pymode_rope_always_show_complete_menu -- bool.
+call helpers#SafeVar("g:pymode_rope_always_show_complete_menu", 0)
+
 " DESC: Init Rope
 py import ropevim
 
+
 fun! RopeCodeAssistInsertMode() "{{{
     call RopeCodeAssist()
     return ""
 endfunction "}}}
 
+
 fun! RopeLuckyAssistInsertMode() "{{{
     call RopeLuckyAssist()
     return ""
 endfunction "}}}
 
+
 fun! RopeOmni(findstart, base) "{{{
     " TODO: Fix omni
     if a:findstart == 1
@@ -73,6 +79,7 @@ fun! RopeOmni(findstart, base) "{{{
     endif
 endfunction "}}}
 
+
 " Rope menu
 menu <silent> Rope.Autoimport :RopeAutoImport<CR>
 menu <silent> Rope.ChangeSignature :RopeChangeSignature<CR>
diff --git a/doc/ropevim.txt b/doc/ropevim.txt
@@ -253,6 +253,9 @@ restructuring can be: >
                                   found is located in another file. By default the
                                   file is open in the same buffer.
 
+*'pymode_rope_always_show_complete_menu'*   If set, rope autocompletion menu
+always show.
+
 
 ==============================================================================
 9. Keybinding ~
diff --git a/ftplugin/python/pymode.vim b/ftplugin/python/pymode.vim
@@ -69,10 +69,12 @@ if g:pymode_rope
     noremap <silent> <buffer> <C-c>d :RopeShowDoc<CR>
     noremap <silent> <buffer> <C-c>f :RopeFindOccurrences<CR>
     noremap <silent> <buffer> <C-c>m :emenu Rope.<TAB>
-    inoremap <silent> <buffer> <Nul> <C-R>=RopeCodeAssistInsertMode()<CR>
-    inoremap <silent> <buffer> <C-space> <C-R>=RopeCodeAssistInsertMode()<CR>
     inoremap <silent> <buffer> <S-TAB> <C-R>=RopeLuckyAssistInsertMode()<CR>
 
+    let s:prascm = g:pymode_rope_always_show_complete_menu ? "<C-P>" : ""    
+    exe "inoremap <silent> <buffer> <Nul> <C-R>=RopeCodeAssistInsertMode()<CR>" . s:prascm
+    exe "inoremap <silent> <buffer> <C-space> <C-R>=RopeCodeAssistInsertMode()<CR>" . s:prascm
+
 endif
 
 " Run code
