patch 7.4.1533
Problem: Using feedkeys() with an empty string disregards 'x' option.
Solution: Make 'x' work with an empty string. (Thinca)
diff --git a/src/eval.c b/src/eval.c
index 825a606..548c50b 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -11839,24 +11839,25 @@
return;
keys = get_tv_string(&argvars[0]);
- if (*keys != NUL)
+
+ if (argvars[1].v_type != VAR_UNKNOWN)
{
- if (argvars[1].v_type != VAR_UNKNOWN)
+ flags = get_tv_string_buf(&argvars[1], nbuf);
+ for ( ; *flags != NUL; ++flags)
{
- flags = get_tv_string_buf(&argvars[1], nbuf);
- for ( ; *flags != NUL; ++flags)
+ switch (*flags)
{
- switch (*flags)
- {
- case 'n': remap = FALSE; break;
- case 'm': remap = TRUE; break;
- case 't': typed = TRUE; break;
- case 'i': insert = TRUE; break;
- case 'x': execute = TRUE; break;
- }
+ case 'n': remap = FALSE; break;
+ case 'm': remap = TRUE; break;
+ case 't': typed = TRUE; break;
+ case 'i': insert = TRUE; break;
+ case 'x': execute = TRUE; break;
}
}
+ }
+ if (*keys != NUL || execute)
+ {
/* Need to escape K_SPECIAL and CSI before putting the string in the
* typeahead buffer. */
keys_esc = vim_strsave_escape_csi(keys);
diff --git a/src/testdir/test_alot.vim b/src/testdir/test_alot.vim
index 857fe9a..46be515 100644
--- a/src/testdir/test_alot.vim
+++ b/src/testdir/test_alot.vim
@@ -5,6 +5,7 @@
source test_cursor_func.vim
source test_delete.vim
source test_expand.vim
+source test_feedkeys.vim
source test_file_perm.vim
source test_glob2regpat.vim
source test_join.vim
diff --git a/src/testdir/test_feedkeys.vim b/src/testdir/test_feedkeys.vim
new file mode 100644
index 0000000..33cd589
--- /dev/null
+++ b/src/testdir/test_feedkeys.vim
@@ -0,0 +1,10 @@
+" Test feedkeys() function.
+
+func Test_feedkeys_x_with_empty_string()
+ new
+ call feedkeys("ifoo\<Esc>")
+ call assert_equal('', getline('.'))
+ call feedkeys('', 'x')
+ call assert_equal('foo', getline('.'))
+ quit!
+endfunc
diff --git a/src/version.c b/src/version.c
index f82b104..980f481 100644
--- a/src/version.c
+++ b/src/version.c
@@ -744,6 +744,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1533,
+/**/
1532,
/**/
1531,
