summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2006-08-29 16:33:06 +0000
committerBram Moolenaar <Bram@vim.org>2006-08-29 16:33:06 +0000
commit7073cc84bc62549c000ea32f08392db4a52f4835 (patch)
tree2bd7fe0fc6acb6124af3562e83858313d7674a00
parent265e5074b59b721f44baae35cfd3af6f9b93b879 (diff)
updated for version 7.0-073v7.0.073
-rw-r--r--src/edit.c4
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 0 deletions
diff --git a/src/edit.c b/src/edit.c
index b5ab7a039f..aa03d8d87b 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -3097,6 +3097,10 @@ ins_compl_new_leader()
/* Show the popup menu with a different set of matches. */
ins_compl_show_pum();
+
+ /* Don't let Enter select the original text when there is no popup menu. */
+ if (compl_match_array == NULL)
+ compl_enter_selects = FALSE;
}
/*
diff --git a/src/version.c b/src/version.c
index 649290ef68..f7ab6154a5 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 73,
+/**/
72,
/**/
71,