Merge branch 'master' into hide-container-impl

This commit is contained in:
ZyX
2017-12-16 14:27:41 +03:00
38 changed files with 457 additions and 157 deletions

View File

@@ -1927,7 +1927,7 @@ bool vim_is_ctrl_x_key(int c)
case CTRL_X_EVAL:
return (c == Ctrl_P || c == Ctrl_N);
}
EMSG(_(e_internal));
internal_error("vim_is_ctrl_x_key()");
return false;
}
@@ -4681,7 +4681,7 @@ static int ins_complete(int c, bool enable_pum)
line = ml_get(curwin->w_cursor.lnum);
compl_pattern = vim_strnsave(line + compl_col, compl_length);
} else {
EMSG2(_(e_intern2), "ins_complete()");
internal_error("ins_complete()");
return FAIL;
}