# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1488132904 -3600
# Node ID 5362b4b6042ca9e130dea2a47ea7f4f14b1a41b9
# Parent  cb1c85dc01d368e5b72e9ca3190760bdc59dfba1
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)

diff --git a/src/edit.c b/src/edit.c
--- 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
--- 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
--- 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,