Merge pull request #6181 from jamessan/vim-8.0.0379

vim-patch:8.0.0379
This commit is contained in:
James McCoy
2017-02-26 22:12:39 -05:00
committed by GitHub
2 changed files with 2 additions and 4 deletions

View File

@@ -801,8 +801,8 @@ static int insert_handle_key(InsertState *s)
goto normalchar; // insert CTRL-Z as normal char goto normalchar; // insert CTRL-Z as normal char
} }
do_cmdline_cmd("stop"); do_cmdline_cmd("stop");
s->c = Ctrl_O; ui_cursor_shape(); // may need to update cursor shape
// FALLTHROUGH break;
case Ctrl_O: // execute one command case Ctrl_O: // execute one command
if (ctrl_x_mode == CTRL_X_OMNI) { if (ctrl_x_mode == CTRL_X_OMNI) {

View File

@@ -2696,8 +2696,6 @@ do_mouse (
else if (((mod_mask & MOD_MASK_CTRL) else if (((mod_mask & MOD_MASK_CTRL)
|| (mod_mask & MOD_MASK_MULTI_CLICK) == MOD_MASK_2CLICK) || (mod_mask & MOD_MASK_MULTI_CLICK) == MOD_MASK_2CLICK)
&& bt_quickfix(curbuf)) { && bt_quickfix(curbuf)) {
if (State & INSERT)
stuffcharReadbuff(Ctrl_O);
if (curwin->w_llist_ref == NULL) { // quickfix window if (curwin->w_llist_ref == NULL) { // quickfix window
do_cmdline_cmd(".cc"); do_cmdline_cmd(".cc");
} else { // location list window } else { // location list window