diff options
Diffstat (limited to 'src/nvim/edit.c')
| -rw-r--r-- | src/nvim/edit.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/nvim/edit.c b/src/nvim/edit.c index e6d9dcf092..4d22d427e4 100644 --- a/src/nvim/edit.c +++ b/src/nvim/edit.c @@ -667,8 +667,9 @@ static int insert_execute(VimState *state, int key) // there is nothing to add, CTRL-L works like CTRL-P then. if (s->c == Ctrl_L && (!CTRL_X_MODE_LINE_OR_EVAL(ctrl_x_mode) - || (int)STRLEN(compl_shown_match->cp_str) - > curwin->w_cursor.col - compl_col)) { + || (compl_shown_match->cp_str != NULL + && (int)STRLEN(compl_shown_match->cp_str) + > curwin->w_cursor.col - compl_col))) { ins_compl_addfrommatch(); return 1; // continue } @@ -3005,7 +3006,6 @@ bool ins_compl_active(void) // Get complete information void get_complete_info(list_T *what_list, dict_T *retdict) { - int ret = OK; #define CI_WHAT_MODE 0x01 #define CI_WHAT_PUM_VISIBLE 0x02 #define CI_WHAT_ITEMS 0x04 @@ -3037,7 +3037,8 @@ void get_complete_info(list_T *what_list, dict_T *retdict) } } - if (ret == OK && (what_flag & CI_WHAT_MODE)) { + int ret = OK; + if (what_flag & CI_WHAT_MODE) { ret = tv_dict_add_str(retdict, S_LEN("mode"), (char *)ins_compl_mode()); } |