From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 22 Jan 2015 21:40:20 +0000 (+0100)
Subject: updated for version 7.4.590
X-Git-Tag: v7.4.590
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=eea478f885ab2fb4185053f1093d05b83bbdf5e1;p=thirdparty%2Fvim.git

updated for version 7.4.590
Problem:    Using ctrl_x_mode as if it contains flags.
Solution:   Don't use AND with CTRL_X_OMNI. (Hirohito Higashi)
---

diff --git a/src/edit.c b/src/edit.c
index 13faafeb78..2a79582173 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 4e78e7f1dd..bef9b19a00 100644
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    590,
 /**/
     589,
 /**/