diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2014-09-12 15:36:29 -0400 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2014-09-12 15:36:29 -0400 |
| commit | 1761a4af711410076e6fdb5f727a83ee54ff5988 (patch) | |
| tree | 394431817303e6cfd1b506aae87cdb2afb37a593 | |
| parent | 6a8932aa588b8631e66255fb24e2776acdd46c8e (diff) | |
| parent | ae33dc0d5a386bae1d8e3f1727f8a59f5937cbef (diff) | |
| download | rneovim-1761a4af711410076e6fdb5f727a83ee54ff5988.tar.gz rneovim-1761a4af711410076e6fdb5f727a83ee54ff5988.tar.bz2 rneovim-1761a4af711410076e6fdb5f727a83ee54ff5988.zip | |
Merge pull request #1162 from atwupack/vp-7.4.357
vim-patch:7.4.357, 7.4.367, 7.4.376
| -rw-r--r-- | src/nvim/edit.c | 2 | ||||
| -rw-r--r-- | src/nvim/version.c | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/nvim/edit.c b/src/nvim/edit.c index 6158176e56..10bee8023e 100644 --- a/src/nvim/edit.c +++ b/src/nvim/edit.c @@ -3798,6 +3798,8 @@ static void ins_compl_delete(void) */ i = compl_col + (compl_cont_status & CONT_ADDING ? compl_length : 0); backspace_until_column(i); + // TODO: is this sufficient for redrawing? Redrawing everything causes + // flicker, thus we can't do that. changed_cline_bef_curs(); } diff --git a/src/nvim/version.c b/src/nvim/version.c index dfcf086e87..fc0b85fde9 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -219,7 +219,7 @@ static int included_patches[] = { //379, //378, //377, - //376, + 376, //375, //374, //373 NA @@ -228,7 +228,7 @@ static int included_patches[] = { 370, //369, //368, - //367, + 367, //366, //365, //364, @@ -238,7 +238,7 @@ static int included_patches[] = { //360, //359, //358, - //357, + 357, //356 NA //355, //354 NA |