aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNaveen Kumar Molleti <nerd.naveen@gmail.com>2014-09-27 00:46:30 +0530
committerJustin M. Keyes <justinkz@gmail.com>2014-10-16 04:18:18 +0000
commit0a2d9fa8c88b6e263b9baa9b639c23321272f9bf (patch)
tree674de464124a0858d67ce997f7894c8ca28ff6d7
parentaf40647b660ddce2542fd19e553bd8f85e69d121 (diff)
downloadrneovim-0a2d9fa8c88b6e263b9baa9b639c23321272f9bf.tar.gz
rneovim-0a2d9fa8c88b6e263b9baa9b639c23321272f9bf.tar.bz2
rneovim-0a2d9fa8c88b6e263b9baa9b639c23321272f9bf.zip
vim-patch:7.4.440 #1244
Problem: Omni complete popup drawn incorrectly. Solution: Call validate_cursor() instead of check_cursor(). (Hirohito Higashi) https://code.google.com/p/vim/source/detail?r=v7-4-440
-rw-r--r--src/nvim/edit.c4
-rw-r--r--src/nvim/version.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/nvim/edit.c b/src/nvim/edit.c
index 5131dc3b38..1d5e1a51cf 100644
--- a/src/nvim/edit.c
+++ b/src/nvim/edit.c
@@ -3302,7 +3302,7 @@ expand_by_function (
goto theend;
}
curwin->w_cursor = pos; /* restore the cursor position */
- check_cursor();
+ validate_cursor();
if (!equalpos(curwin->w_cursor, pos)) {
EMSG(_(e_compldel));
goto theend;
@@ -4369,7 +4369,7 @@ static int ins_complete(int c)
return FAIL;
}
curwin->w_cursor = pos; /* restore the cursor position */
- check_cursor();
+ validate_cursor();
if (!equalpos(curwin->w_cursor, pos)) {
EMSG(_(e_compldel));
return FAIL;
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 18046f9617..ca5506c567 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -192,7 +192,7 @@ static int included_patches[] = {
//443,
//442,
//441,
- //440,
+ 440,
439,
//438,
//437,