diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-02-26 19:09:05 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-02-26 19:09:05 +0100 |
| commit | 74a47162a07fddb532f4bead212f6c80ef474ae7 (patch) | |
| tree | 3683f1a0f3ac24bf0888f072f9226a604e6e7ae8 | |
| parent | 0c8485f0e4931463c0f7986e1ea84a7d79f10c75 (diff) | |
| download | vim-git-74a47162a07fddb532f4bead212f6c80ef474ae7.tar.gz | |
patch 8.0.0379: CTRL-Z and mouse click use CTRL-O unnecessaryv8.0.0379
Problem: CTRL-Z and mouse click use CTRL-O unnecessary.
Solution: Remove stuffing CTRL-O. (James McCoy, closes #1453)
| -rw-r--r-- | src/edit.c | 6 | ||||
| -rw-r--r-- | src/normal.c | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 8 insertions, 4 deletions
diff --git a/src/edit.c b/src/edit.c index 9a824322f..6fc1e35ac 100644 --- a/src/edit.c +++ b/src/edit.c @@ -1038,8 +1038,10 @@ doESCkey: if (!p_im) goto normalchar; /* insert CTRL-Z as normal char */ do_cmdline_cmd((char_u *)"stop"); - c = Ctrl_O; - /*FALLTHROUGH*/ +#ifdef CURSOR_SHAPE + ui_cursor_shape(); /* may need to update cursor shape */ +#endif + continue; case Ctrl_O: /* execute one command */ #ifdef FEAT_COMPL_FUNC diff --git a/src/normal.c b/src/normal.c index ce8ca531a..c8385f6a8 100644 --- a/src/normal.c +++ b/src/normal.c @@ -2982,8 +2982,6 @@ do_mouse( || (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((char_u *)".cc"); else /* location list window */ @@ -6193,10 +6191,12 @@ nv_down(cmdarg_T *cap) #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX) /* In a quickfix window a <CR> jumps to the error under the cursor. */ if (bt_quickfix(curbuf) && cap->cmdchar == CAR) + { if (curwin->w_llist_ref == NULL) do_cmdline_cmd((char_u *)".cc"); /* quickfix window */ else do_cmdline_cmd((char_u *)".ll"); /* location list window */ + } else #endif { diff --git a/src/version.c b/src/version.c index 026b82981..21f416950 100644 --- a/src/version.c +++ b/src/version.c @@ -765,6 +765,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 379, +/**/ 378, /**/ 377, |