aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/eval.c
diff options
context:
space:
mode:
authorWei Huang <daviseago@gmail.com>2016-09-10 23:11:05 +0800
committerJustin M. Keyes <justinkz@gmail.com>2016-09-11 03:47:16 +0200
commitc4c29696245b9ef03935335f464dbaa2b46c2ba5 (patch)
tree9ebc093bc5cad06cab0c616e2136d89db45c3d48 /src/nvim/eval.c
parentca65514a241b239e656cb87f0912bd9ba2e18ad8 (diff)
downloadrneovim-c4c29696245b9ef03935335f464dbaa2b46c2ba5.tar.gz
rneovim-c4c29696245b9ef03935335f464dbaa2b46c2ba5.tar.bz2
rneovim-c4c29696245b9ef03935335f464dbaa2b46c2ba5.zip
vim-patch:7.4.1533 #5320
Problem: Using feedkeys() with an empty string disregards 'x' option. Solution: Make 'x' work with an empty string. (Thinca) When integrating the patch to nvim, used same logic but different code based on nvim codebase. New test passed. https://github.com/vim/vim/commit/74c5bbf13435a7ab1e3461078bbcb1200f0451e1
Diffstat (limited to 'src/nvim/eval.c')
-rw-r--r--src/nvim/eval.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index ce04739ee4..e441f96e7e 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -8831,14 +8831,13 @@ static void f_feedkeys(typval_T *argvars, typval_T *rettv, FunPtr fptr)
return;
keys = get_tv_string(&argvars[0]);
- if (*keys != NUL) {
- if (argvars[1].v_type != VAR_UNKNOWN) {
- flags = get_tv_string_buf(&argvars[1], nbuf);
- }
- nvim_feedkeys(cstr_as_string((char *)keys),
- cstr_as_string((char *)flags), true);
+ if (argvars[1].v_type != VAR_UNKNOWN) {
+ flags = get_tv_string_buf(&argvars[1], nbuf);
}
+
+ nvim_feedkeys(cstr_as_string((char *)keys),
+ cstr_as_string((char *)flags), true);
}
/// "filereadable()" function