summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2013-03-07 19:38:54 +0100
committerBram Moolenaar <Bram@vim.org>2013-03-07 19:38:54 +0100
commit3978e08fbee9a1ef6b988cae73e95cb18467733b (patch)
treee5e21faf0592bf82d1e7c01fbdb604eaa6f3ee91
parentdb813951c4fc1f91aaaeb4e72d37942e13cb1f0e (diff)
updated for version 7.3.854v7.3.854
Problem: After using backspace in insert mode completion, CTRL-N and CTRL-P do not highlight the right entry. (Olivier Teuliere) Solution: Set the current item to the shown item after using backspace.
-rw-r--r--src/edit.c3
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 0 deletions
diff --git a/src/edit.c b/src/edit.c
index 74bbd9a109..88fd18af1d 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -3380,6 +3380,9 @@ ins_compl_bs()
if (compl_leader != NULL)
{
ins_compl_new_leader();
+ if (compl_shown_match != NULL)
+ /* Make sure current match is not a hidden item. */
+ compl_curr_match = compl_shown_match;
return NUL;
}
return K_BS;
diff --git a/src/version.c b/src/version.c
index b6e4f3894a..7c1e274ef1 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 854,
+/**/
853,
/**/
852,