thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

updated for version 7.4.590

Browse Source 
Problem:    Using ctrl_x_mode as if it contains flags.
Solution:   Don't use AND with CTRL_X_OMNI. (Hirohito Higashi)
This commit is contained in:
Bram Moolenaar
2015-01-22 22:40:20 +01:00
parent 1ec4dd41de
commit eea478f885
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/edit.c
View File

@@ -3394,7 +3394,7 @@ ins_compl_bs()
* allow the word to be deleted, we won't match everything. */ * allow the word to be deleted, we won't match everything. */
if ((int)(p - line) - (int)compl_col < 0 if ((int)(p - line) - (int)compl_col < 0
|| ((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; return K_BS;
/* Deleted more than what was used to find matches or didn't finish /* Deleted more than what was used to find matches or didn't finish

2
src/version.c
View File

@@ -741,6 +741,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
590,
/**/ /**/
589, 589,
/**/ /**/