patch 7.4.1692

Problem:    feedkeys('i', 'x') gets stuck, waits for a character to be typed.
Solution:   Behave like ":normal". (Yasuhiro Matsumoto)

diff --git a/src/eval.c b/src/eval.c
index b2f4462f3fa920b25a138e57b58b3056c54eda0a..e1d69d00deed08d14c68ee7dbf6a1ba473164588 100644 (file)
--- a/src/eval.c
+++ b/src/eval.c
@@ -11368,7 +11368,10 @@ f_feedkeys(typval_T *argvars, typval_T *rettv UNUSED)
 
                /* Avoid a 1 second delay when the keys start Insert mode. */
                msg_scroll = FALSE;
+
+               ++ex_normal_busy;
                exec_normal(TRUE);
+               --ex_normal_busy;
                msg_scroll |= save_msg_scroll;
            }
        }

diff --git a/src/testdir/test_feedkeys.vim b/src/testdir/test_feedkeys.vim
index 33cd58949d688200e541031e50e0969f6eda2748..70500f2bb571fa290b605adad5044cea1d666f91 100644 (file)
--- a/src/testdir/test_feedkeys.vim
+++ b/src/testdir/test_feedkeys.vim
@@ -6,5 +6,9 @@ func Test_feedkeys_x_with_empty_string()
   call assert_equal('', getline('.'))
   call feedkeys('', 'x')
   call assert_equal('foo', getline('.'))
+
+  " check it goes back to normal mode immediately.
+  call feedkeys('i', 'x')
+  call assert_equal('foo', getline('.'))
   quit!
 endfunc

diff --git a/src/version.c b/src/version.c
index d08e7307b6777da19e5a3a64412df56687578615..c1e8fb7b916fe58bc1ff6e6ee10fbeafd5ddeffd 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -748,6 +748,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1692,
 /**/
     1691,
 /**/