Skip to content

Commit 74a4716

Browse files
committed
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)
1 parent 0c8485f commit 74a4716

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

src/edit.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1038,8 +1038,10 @@ edit(
10381038
if (!p_im)
10391039
goto normalchar; /* insert CTRL-Z as normal char */
10401040
do_cmdline_cmd((char_u *)"stop");
1041-
c = Ctrl_O;
1042-
/*FALLTHROUGH*/
1041+
#ifdef CURSOR_SHAPE
1042+
ui_cursor_shape(); /* may need to update cursor shape */
1043+
#endif
1044+
continue;
10431045

10441046
case Ctrl_O: /* execute one command */
10451047
#ifdef FEAT_COMPL_FUNC

src/normal.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2982,8 +2982,6 @@ do_mouse(
29822982
|| (mod_mask & MOD_MASK_MULTI_CLICK) == MOD_MASK_2CLICK)
29832983
&& bt_quickfix(curbuf))
29842984
{
2985-
if (State & INSERT)
2986-
stuffcharReadbuff(Ctrl_O);
29872985
if (curwin->w_llist_ref == NULL) /* quickfix window */
29882986
do_cmdline_cmd((char_u *)".cc");
29892987
else /* location list window */
@@ -6193,10 +6191,12 @@ nv_down(cmdarg_T *cap)
61936191
#if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
61946192
/* In a quickfix window a <CR> jumps to the error under the cursor. */
61956193
if (bt_quickfix(curbuf) && cap->cmdchar == CAR)
6194+
{
61966195
if (curwin->w_llist_ref == NULL)
61976196
do_cmdline_cmd((char_u *)".cc"); /* quickfix window */
61986197
else
61996198
do_cmdline_cmd((char_u *)".ll"); /* location list window */
6199+
}
62006200
else
62016201
#endif
62026202
{

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -764,6 +764,8 @@ static char *(features[]) =
764764

765765
static int included_patches[] =
766766
{ /* Add new patch number below this line */
767+
/**/
768+
379,
767769
/**/
768770
378,
769771
/**/

0 commit comments

Comments
 (0)