aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-25 10:54:51 -04:00
Code

patch 8.2.3270: prop_find() finds property with ID -2

Browse Source 
Problem:    prop_find() finds property with ID -2.
Solution:   Use a separate flag to indicate an ID was specified. (issue #8674)
This commit is contained in:
Bram Moolenaar 2021-08-01 19:28:15 +02:00
parent f78da4f9d6
commit 0d4d9ee9bb
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/textprop.c
View File

@ -623,7 +623,8 @@ f_prop_find(typval_T *argvars, typval_T *rettv)
int lnum_start; int lnum_start;
int start_pos_has_prop = 0; int start_pos_has_prop = 0;
int seen_end = 0; int seen_end = 0;
int id = -1; int id = 0;
int id_found = FALSE;
int type_id = -1; int type_id = -1;
int skipstart = 0; int skipstart = 0;
int lnum = -1; int lnum = -1;
@ -688,8 +689,7 @@ f_prop_find(typval_T *argvars, typval_T *rettv)
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_found = id != 0;
id = -2;
} }
if (dict_find(dict, (char_u *)"type", -1)) if (dict_find(dict, (char_u *)"type", -1))
{ {
@ -701,12 +701,12 @@ f_prop_find(typval_T *argvars, typval_T *rettv)
type_id = type->pt_id; type_id = type->pt_id;
} }
both = dict_get_bool(dict, (char_u *)"both", FALSE); both = dict_get_bool(dict, (char_u *)"both", FALSE);
if (id == -1 && type_id == -1) if (!id_found && type_id == -1)
{ {
emsg(_("E968: Need at least one of 'id' or 'type'")); emsg(_("E968: Need at least one of 'id' or 'type'"));
return; return;
} }
if (both && (id == -1 || type_id == -1)) if (both && (!id_found || type_id == -1))
{ {
emsg(_("E860: Need 'id' and 'type' with 'both'")); emsg(_("E860: Need 'id' and 'type' with 'both'"));
return; return;
@ -744,7 +744,8 @@ f_prop_find(typval_T *argvars, typval_T *rettv)
continue; continue;
} }
if (both ? prop.tp_id == id && prop.tp_type == type_id if (both ? prop.tp_id == id && prop.tp_type == type_id
: prop.tp_id == id || prop.tp_type == type_id) : (id_found && prop.tp_id == id)
|| prop.tp_type == type_id)
{ {
// Check if the starting position has text props. // Check if the starting position has text props.
if (lnum_start == lnum if (lnum_start == lnum

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 */
/**/
3270,
/**/ /**/
3269, 3269,
/**/ /**/