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 13faafeb785c7612858eabca45b54cb3c3f2432c..2a7958217360e3a29b909cbde5cf3e9d9044b210 100644 (file)
--- 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 4e78e7f1dd309f65be1960f0b2ab699e873b37b6..bef9b19a0056a2243541f1bba2f3dd886fbbf043 100644 (file)
--- 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,
 /**/