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

patch 8.2.3609: internal error when ModeChanged is triggered recursively

Browse Source 
Problem:    Internal error when ModeChanged is triggered when v:event is
            already in use.
Solution:   Save and restore v:event if needed.
This commit is contained in:
Bram Moolenaar
2021-11-17 15:51:52 +00:00
parent 125ffd21f9
commit 3075a45592
7 changed files with 65 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/insexpand.c
View File

@@ -962,7 +962,7 @@ pum_enough_matches(void)
return (i >= 2);
}
#ifdef FEAT_EVAL
#if defined(FEAT_EVAL) || defined(PROTO)
/*
* Allocate Dict for the completed item.
* { word, abbr, menu, kind, info }
@@ -993,17 +993,18 @@ trigger_complete_changed_event(int cur)
dict_T *v_event;
dict_T *item;
static int recursive = FALSE;
save_v_event_T save_v_event;
if (recursive)
return;
v_event = get_vim_var_dict(VV_EVENT);
if (cur < 0)
item = dict_alloc();
else
item = ins_compl_dict_alloc(compl_curr_match);
if (item == NULL)
return;
v_event = get_v_event(&save_v_event);
dict_add_dict(v_event, "completed_item", item);
pum_set_event_info(v_event);
dict_set_items_ro(v_event);
@@ -1014,8 +1015,7 @@ trigger_complete_changed_event(int cur)
textwinlock--;
recursive = FALSE;
dict_free_contents(v_event);
hash_init(&v_event->dv_hashtab);
restore_v_event(v_event, &save_v_event);
}
#endif