changeset 7705:1b9a1c10806b v7.4.1151

commit https://github.com/vim/vim/commit/5f8a14b9dea094b8bbab94cfc1e8da8e633fbc01 Author: Bram Moolenaar <Bram@vim.org> Date: Thu Jan 21 23:34:58 2016 +0100 patch 7.4.1151 Problem: Missing change to eval.c Solution: Also change feedkeys().
author Christian Brabandt <cb@256bit.org>
date Thu, 21 Jan 2016 23:45:06 +0100
parents 38de8d8f20a7
children dd457970efc8
files src/eval.c src/version.c
diffstat 2 files changed, 6 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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);
 	}
     }
 }
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1151,
+/**/
     1150,
 /**/
     1149,