0
0
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00

updated for version 7.0-200

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

View File

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