aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.2.0086: build error for small version

Browse Source 
Problem:    Build error for small version. (Tony Mechelynck)
Solution:   Only use "user_data" with the +eval feature. Remove unused
            variable.
This commit is contained in:
Bram Moolenaar 2020-01-04 19:00:11 +01:00
parent 3d8a513b46
commit ab782c5b6f
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/dict.c
View File

@ -618,7 +618,6 @@ dict_find(dict_T *d, char_u *key, int len)
dict_get_tv(dict_T *d, char_u *key, typval_T *rettv) dict_get_tv(dict_T *d, char_u *key, typval_T *rettv)
{ {
dictitem_T *di; dictitem_T *di;
char_u *s;
di = dict_find(d, key, -1); di = dict_find(d, key, -1);
if (di == NULL) if (di == NULL)

6
src/insexpand.c
View File

@ -103,7 +103,9 @@ struct compl_S
compl_T *cp_prev; compl_T *cp_prev;
char_u *cp_str; // matched text char_u *cp_str; // matched text
char_u *(cp_text[CPT_COUNT]); // text for the menu char_u *(cp_text[CPT_COUNT]); // text for the menu
#ifdef FEAT_EVAL
typval_T cp_user_data; typval_T cp_user_data;
#endif
char_u *cp_fname; // file containing the match, allocated when char_u *cp_fname; // file containing the match, allocated when
// cp_flags has CP_FREE_FNAME // cp_flags has CP_FREE_FNAME
int cp_flags; // CP_ values int cp_flags; // CP_ values
@ -647,8 +649,10 @@ ins_compl_add(
if (cptext[i] != NULL && *cptext[i] != NUL) if (cptext[i] != NULL && *cptext[i] != NUL)
match->cp_text[i] = vim_strsave(cptext[i]); match->cp_text[i] = vim_strsave(cptext[i]);
} }
#ifdef FEAT_EVAL
if (user_data != NULL) if (user_data != NULL)
match->cp_user_data = *user_data; match->cp_user_data = *user_data;
#endif
// Link the new match structure in the list of matches. // Link the new match structure in the list of matches.
if (compl_first_match == NULL) if (compl_first_match == NULL)
@ -1459,7 +1463,9 @@ ins_compl_free(void)
vim_free(match->cp_fname); vim_free(match->cp_fname);
for (i = 0; i < CPT_COUNT; ++i) for (i = 0; i < CPT_COUNT; ++i)
vim_free(match->cp_text[i]); vim_free(match->cp_text[i]);
#ifdef FEAT_EVAL
clear_tv(&match->cp_user_data); clear_tv(&match->cp_user_data);
#endif
vim_free(match); vim_free(match);
} while (compl_curr_match != NULL && compl_curr_match != compl_first_match); } while (compl_curr_match != NULL && compl_curr_match != compl_first_match);
compl_first_match = compl_curr_match = NULL; compl_first_match = compl_curr_match = NULL;

2
src/version.c
View File

@ -742,6 +742,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 */
/**/
86,
/**/ /**/
85, 85,
/**/ /**/