From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 21 Jan 2016 22:34:58 +0000 (+0100)
Subject: patch 7.4.1151
X-Git-Tag: v7.4.1151
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5f8a14b9dea094b8bbab94cfc1e8da8e633fbc01;p=vim

patch 7.4.1151
Problem:    Missing change to eval.c
Solution:   Also change feedkeys().
---

diff --git a/src/eval.c b/src/eval.c
index de30f712e..565d71d78 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -10960,6 +10960,7 @@ f_feedkeys(argvars, rettv)
     char_u	*keys, *flags;
     char_u	nbuf[NUMBUFLEN];
     int		typed = FALSE;
+    int		execute = FALSE;
     char_u	*keys_esc;
 
     /* This is not allowed in the sandbox.  If the commands would still be
@@ -10982,6 +10983,7 @@ f_feedkeys(argvars, rettv)
 		    case 'm': remap = TRUE; break;
 		    case 't': typed = TRUE; break;
 		    case 'i': insert = TRUE; break;
+		    case 'x': execute = TRUE; break;
 		}
 	    }
 	}
@@ -10996,6 +10998,8 @@ f_feedkeys(argvars, rettv)
 	    vim_free(keys_esc);
 	    if (vgetc_busy)
 		typebuf_was_filled = TRUE;
+	    if (execute)
+		exec_normal(TRUE);
 	}
     }
 }
diff --git a/src/version.c b/src/version.c
index 6aee23d43..83540a49c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1151,
 /**/
     1150,
 /**/