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)
diff --git a/src/edit.c b/src/edit.c
index 9a82432..6fc1e35 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -1038,8 +1038,10 @@
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 ce8ca53..c8385f6 100644
--- a/src/normal.c
+++ b/src/normal.c
@@ -2982,8 +2982,6 @@
|| (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 @@
#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 026b829..21f4169 100644
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 379,
+/**/
378,
/**/
377,