]> granicus.if.org Git - vim/commitdiff
patch 7.4.1151 v7.4.1151
authorBram Moolenaar <Bram@vim.org>
Thu, 21 Jan 2016 22:34:58 +0000 (23:34 +0100)
committerBram Moolenaar <Bram@vim.org>
Thu, 21 Jan 2016 22:34:58 +0000 (23:34 +0100)
Problem:    Missing change to eval.c
Solution:   Also change feedkeys().

src/eval.c
src/version.c

index de30f712ee495c9193b2c442e2dd04b8e6667a18..565d71d78631075665d10ce7aaccee577d469fc2 100644 (file)
@@ -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);
        }
     }
 }
index 6aee23d435e2db31083a39f814abde0562b9350f..83540a49cbc361f4c37b0a08e7e692dfeb686bad 100644 (file)
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1151,
 /**/
     1150,
 /**/