changeset 6526:5b8d26b85437 v7.4.590

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)
author Bram Moolenaar <bram@vim.org>
date Thu, 22 Jan 2015 22:40:20 +0100
parents 29ab85b9d093
children 41aee763b819
files src/edit.c src/version.c
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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,