aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

updated for version 7.0-200

Browse Source
This commit is contained in:
Bram Moolenaar
2007-02-20 02:49:19 +00:00
parent 09a16b5f09
commit fa3491a0e0
3 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/diff.c
View File

@@ -1822,14 +1822,20 @@ diff_find_change(wp, lnum, startp, endp)
idx = diff_buf_idx(wp->w_buffer); idx = diff_buf_idx(wp->w_buffer);
if (idx == DB_COUNT) /* cannot happen */ if (idx == DB_COUNT) /* cannot happen */
{
vim_free(line_org);
return FALSE; return FALSE;
}
/* search for a change that includes "lnum" in the list of diffblocks. */ /* search for a change that includes "lnum" in the list of diffblocks. */
for (dp = curtab->tp_first_diff; dp != NULL; dp = dp->df_next) for (dp = curtab->tp_first_diff; dp != NULL; dp = dp->df_next)
if (lnum <= dp->df_lnum[idx] + dp->df_count[idx]) if (lnum <= dp->df_lnum[idx] + dp->df_count[idx])
break; break;
if (dp == NULL || diff_check_sanity(curtab, dp) == FAIL) if (dp == NULL || diff_check_sanity(curtab, dp) == FAIL)
{
vim_free(line_org);
return FALSE; return FALSE;
}
off = lnum - dp->df_lnum[idx]; off = lnum - dp->df_lnum[idx];

5
src/edit.c
View File

@@ -2698,6 +2698,7 @@ ins_compl_dictionaries(dict_start, pat, flags, thesaurus)
buf = alloc(LSIZE); buf = alloc(LSIZE);
if (buf == NULL) if (buf == NULL)
return; return;
regmatch.regprog = NULL; /* so that we can goto theend */
/* If 'infercase' is set, don't use 'smartcase' here */ /* If 'infercase' is set, don't use 'smartcase' here */
save_p_scs = p_scs; save_p_scs = p_scs;
@@ -2712,13 +2713,13 @@ ins_compl_dictionaries(dict_start, pat, flags, thesaurus)
char_u *pat_esc = vim_strsave_escaped(pat, (char_u *)"\\"); char_u *pat_esc = vim_strsave_escaped(pat, (char_u *)"\\");
if (pat_esc == NULL) if (pat_esc == NULL)
return ; goto theend ;
i = (int)STRLEN(pat_esc) + 10; i = (int)STRLEN(pat_esc) + 10;
ptr = alloc(i); ptr = alloc(i);
if (ptr == NULL) if (ptr == NULL)
{ {
vim_free(pat_esc); vim_free(pat_esc);
return; goto theend;
} }
vim_snprintf((char *)ptr, i, "^\\s*\\zs\\V%s", pat_esc); vim_snprintf((char *)ptr, i, "^\\s*\\zs\\V%s", pat_esc);
regmatch.regprog = vim_regcomp(ptr, RE_MAGIC); regmatch.regprog = vim_regcomp(ptr, RE_MAGIC);

2
src/version.c
View File

@@ -666,6 +666,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 */
/**/
200,
/**/ /**/
199, 199,
/**/ /**/