Mercurial > vim
changeset 10980:5362b4b6042c v8.0.0379
patch 8.0.0379: CTRL-Z and mouse click use CTRL-O unnecessary
commit https://github.com/vim/vim/commit/74a47162a07fddb532f4bead212f6c80ef474ae7
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Feb 26 19:09:05 2017 +0100
patch 8.0.0379: CTRL-Z and mouse click use CTRL-O unnecessary
Problem: CTRL-Z and mouse click use CTRL-O unnecessary.
Solution: Remove stuffing CTRL-O. (James McCoy, closes https://github.com/vim/vim/issues/1453)
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Sun, 26 Feb 2017 19:15:04 +0100 |
parents | cb1c85dc01d3 |
children | a03c6919dfdc |
files | src/edit.c src/normal.c src/version.c |
diffstat | 3 files changed, 8 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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 {