merge master to dev

2013-12-23 20:47:20 +01:00
parent 57a2cc787b 8aa53ee576
commit d43768c7b5
4 changed files with 23 additions and 13 deletions
--- a/autoload/jedi.vim
+++ b/autoload/jedi.vim
@@ -217,7 +217,6 @@ endfunction
 " ------------------------------------------------------------------------
 " deprecations
 " ------------------------------------------------------------------------
-
 let s:deprecations = {
    \ 'get_definition_command':     'goto_definitions_command',
    \ 'goto_command':               'goto_assignments_command',
@@ -261,7 +260,6 @@ function! s:init()
      end
  endfor

-
  for [key, val] in items(s:settings)
      if !exists('g:jedi#'.key)
          exe 'let g:jedi#'.key.' = '.val