diff options
| author | James McCoy <jamessan@jamessan.com> | 2017-02-26 22:12:39 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-26 22:12:39 -0500 |
| commit | 73a054d84427191f70ea59fc6dc34314b28ad07c (patch) | |
| tree | dec60f9a3106c59927fa5733695147f65cfc15c8 | |
| parent | 7ea81fe443369382b3ec8c9cfb5a80bcbcbe40bd (diff) | |
| parent | 69bfe14b79fc1a141ef13b89fdacbec8e7459e33 (diff) | |
| download | rneovim-73a054d84427191f70ea59fc6dc34314b28ad07c.tar.gz rneovim-73a054d84427191f70ea59fc6dc34314b28ad07c.tar.bz2 rneovim-73a054d84427191f70ea59fc6dc34314b28ad07c.zip | |
Merge pull request #6181 from jamessan/vim-8.0.0379
vim-patch:8.0.0379
| -rw-r--r-- | src/nvim/edit.c | 4 | ||||
| -rw-r--r-- | src/nvim/normal.c | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/nvim/edit.c b/src/nvim/edit.c index 73d8793a84..ecc794fb14 100644 --- a/src/nvim/edit.c +++ b/src/nvim/edit.c @@ -801,8 +801,8 @@ static int insert_handle_key(InsertState *s) goto normalchar; // insert CTRL-Z as normal char } do_cmdline_cmd("stop"); - s->c = Ctrl_O; - // FALLTHROUGH + ui_cursor_shape(); // may need to update cursor shape + break; case Ctrl_O: // execute one command if (ctrl_x_mode == CTRL_X_OMNI) { diff --git a/src/nvim/normal.c b/src/nvim/normal.c index 756053dc73..86aefda2b2 100644 --- a/src/nvim/normal.c +++ b/src/nvim/normal.c @@ -2696,8 +2696,6 @@ do_mouse ( else if (((mod_mask & MOD_MASK_CTRL) || (mod_mask & MOD_MASK_MULTI_CLICK) == MOD_MASK_2CLICK) && bt_quickfix(curbuf)) { - if (State & INSERT) - stuffcharReadbuff(Ctrl_O); if (curwin->w_llist_ref == NULL) { // quickfix window do_cmdline_cmd(".cc"); } else { // location list window |