thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.2.3257: calling prop_find() with -1 for ID gives errornous error

Browse Source 
Problem:    Calling prop_find() with -1 for ID gives errornous error. (Naohiro
            Ono)
Solution:   When passing -1 use -2. (closes #8674)
This commit is contained in:
Bram Moolenaar
2021-07-31 18:33:57 +02:00
parent bf634a0a8b
commit 8e3fc135e8
3 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/testdir/test_textprop.vim
View File

@@ -239,6 +239,9 @@ func Test_prop_find()
let result = prop_find({'type': 'prop_name', 'lnum': 1}, 'f') let result = prop_find({'type': 'prop_name', 'lnum': 1}, 'f')
call assert_equal(expected[0], result) call assert_equal(expected[0], result)
" When ID is -1 it's like prop is not found.
call assert_equal({}, prop_find({'id': -1}))
call prop_clear(1,6) call prop_clear(1,6)
call prop_type_delete('prop_name') call prop_type_delete('prop_name')

4
src/textprop.c
View File

@@ -686,7 +686,11 @@ f_prop_find(typval_T *argvars, typval_T *rettv)
skipstart = dict_get_bool(dict, (char_u *)"skipstart", 0); skipstart = dict_get_bool(dict, (char_u *)"skipstart", 0);
if (dict_find(dict, (char_u *)"id", -1) != NULL) if (dict_find(dict, (char_u *)"id", -1) != NULL)
{
id = dict_get_number(dict, (char_u *)"id"); id = dict_get_number(dict, (char_u *)"id");
if (id == -1)
id = -2;
}
if (dict_find(dict, (char_u *)"type", -1)) if (dict_find(dict, (char_u *)"type", -1))
{ {
char_u *name = dict_get_string(dict, (char_u *)"type", FALSE); char_u *name = dict_get_string(dict, (char_u *)"type", FALSE);

2
src/version.c
View File

@@ -755,6 +755,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
3257,
/**/ /**/
3256, 3256,
/**/ /**/