forked from aniani/vim
patch 7.4.1646
Problem: Using Python vim.bindeval() on a partial doesn't work. (Nikolai
Pavlov)
Solution: Add VAR_PARTIAL support in Python.
This commit is contained in:
@@ -6032,13 +6032,26 @@ ConvertToPyObject(typval_T *tv)
|
||||
case VAR_FUNC:
|
||||
return NEW_FUNCTION(tv->vval.v_string == NULL
|
||||
? (char_u *)"" : tv->vval.v_string);
|
||||
case VAR_PARTIAL:
|
||||
return NEW_FUNCTION(tv->vval.v_partial == NULL
|
||||
? (char_u *)"" : tv->vval.v_partial->pt_name);
|
||||
case VAR_UNKNOWN:
|
||||
case VAR_CHANNEL:
|
||||
case VAR_JOB:
|
||||
Py_INCREF(Py_None);
|
||||
return Py_None;
|
||||
default:
|
||||
case VAR_SPECIAL:
|
||||
switch (tv->vval.v_number)
|
||||
{
|
||||
case VVAL_FALSE: return AlwaysFalse(NULL);
|
||||
case VVAL_TRUE: return AlwaysTrue(NULL);
|
||||
case VVAL_NONE:
|
||||
case VVAL_NULL: return AlwaysNone(NULL);
|
||||
}
|
||||
PyErr_SET_VIM(N_("internal error: invalid value type"));
|
||||
return NULL;
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
typedef struct
|
||||
|
||||
@@ -206,3 +206,17 @@ func Test_redefine_dict_func()
|
||||
call assert_true(v:errmsg, v:exception)
|
||||
endtry
|
||||
endfunc
|
||||
|
||||
func Test_bind_in_python()
|
||||
if has('python')
|
||||
let g:d = {}
|
||||
function g:d.test2()
|
||||
endfunction
|
||||
python import vim
|
||||
try
|
||||
call assert_equal(pyeval('vim.bindeval("g:d.test2")'), g:d.test2)
|
||||
catch
|
||||
call assert_true(v:false, v:exception)
|
||||
endtry
|
||||
endif
|
||||
endfunc
|
||||
|
||||
@@ -748,6 +748,8 @@ static char *(features[]) =
|
||||
|
||||
static int included_patches[] =
|
||||
{ /* Add new patch number below this line */
|
||||
/**/
|
||||
1646,
|
||||
/**/
|
||||
1645,
|
||||
/**/
|
||||
|
||||
Reference in New Issue
Block a user