summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2011-09-05 20:13:42 +0200
committerBram Moolenaar <Bram@vim.org>2011-09-05 20:13:42 +0200
commit01a78342e05d2ab699258caae26c6df90b34f342 (patch)
tree2f4c3725c496d123498e994c3659ce5df51120c8
parentd3184b57d2f1528abaf6079a564817a189a9b359 (diff)
downloadvim-git-01a78342e05d2ab699258caae26c6df90b34f342.tar.gz
updated for version 7.3.294v7.3.294
Problem: Patch 289 causes more problems than it solves. Solution: Rever the patch untill a better solution is found.
-rw-r--r--src/edit.c9
-rw-r--r--src/version.c2
2 files changed, 2 insertions, 9 deletions
diff --git a/src/edit.c b/src/edit.c
index c9cfca656..711bfccc9 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -3367,15 +3367,6 @@ ins_compl_new_leader()
ins_bytes(compl_leader + ins_compl_len());
compl_used_match = FALSE;
-#ifdef FEAT_COMPL_FUNC
- /*
- * To call eval 'completefunc' when leader is changed, restart completion
- * every time.
- */
- if (ctrl_x_mode == CTRL_X_FUNCTION || ctrl_x_mode == CTRL_X_OMNI)
- ins_compl_restart();
-#endif
-
if (compl_started)
ins_compl_set_original_text(compl_leader);
else
diff --git a/src/version.c b/src/version.c
index d66b4fba2..f1e7dc2f8 100644
--- a/src/version.c
+++ b/src/version.c
@@ -710,6 +710,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 294,
+/**/
293,
/**/
292,