Permalink
Browse files

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 #1453)
  • Loading branch information...
brammool committed Feb 26, 2017
1 parent 0c8485f commit 74a47162a07fddb532f4bead212f6c80ef474ae7
Showing with 8 additions and 4 deletions.
  1. +4 −2 src/edit.c
  2. +2 −2 src/normal.c
  3. +2 −0 src/version.c
View
@@ -1038,8 +1038,10 @@ edit(
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
View
@@ -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
{
View
@@ -764,6 +764,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 379,
/**/
378,
/**/

0 comments on commit 74a4716

Please sign in to comment.