summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <bram@vim.org>2015-01-22 22:40:20 +0100
committerBram Moolenaar <bram@vim.org>2015-01-22 22:40:20 +0100
commitd95d2fc9c73eac9078fe7b180006dbfe3fcda015 (patch)
tree7ba8b202c2d40403c796dd315dcfc269a0942771
parent28aae179c5256a9a04e2bdc08c150a2570c93b55 (diff)
downloadvim-d95d2fc9c73eac9078fe7b180006dbfe3fcda015.tar.gz
updated for version 7.4.590v7.4.590v7-4-590
Problem: Using ctrl_x_mode as if it contains flags. Solution: Don't use AND with CTRL_X_OMNI. (Hirohito Higashi)
-rw-r--r--src/edit.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/edit.c b/src/edit.c
index 13faafeb..2a795821 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -3394,7 +3394,7 @@ ins_compl_bs()
* allow the word to be deleted, we won't match everything. */
if ((int)(p - line) - (int)compl_col < 0
|| ((int)(p - line) - (int)compl_col == 0
- && (ctrl_x_mode & CTRL_X_OMNI) == 0))
+ && ctrl_x_mode != CTRL_X_OMNI))
return K_BS;
/* Deleted more than what was used to find matches or didn't finish
diff --git a/src/version.c b/src/version.c
index 4e78e7f1..bef9b19a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 590,
+/**/
589,
/**/
588,