diff options
| author | Bram Moolenaar <Bram@vim.org> | 2007-02-20 02:49:19 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2007-02-20 02:49:19 +0000 |
| commit | fa3491a0e0e8c91431583ae18ae9605aac24cc3d (patch) | |
| tree | 38a813ba7bf2e331038e394d85884546b0586f3a | |
| parent | 09a16b5f09eaf11d28d8b33cdd6c410c0f40cd5a (diff) | |
| download | vim-fa3491a0e0e8c91431583ae18ae9605aac24cc3d.zip | |
updated for version 7.0-200
| -rw-r--r-- | src/diff.c | 6 | ||||
| -rw-r--r-- | src/edit.c | 5 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 11 insertions, 2 deletions
diff --git a/src/diff.c b/src/diff.c index 22cf5af0d..daa1f19c2 100644 --- a/src/diff.c +++ b/src/diff.c @@ -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]; diff --git a/src/edit.c b/src/edit.c index b0e6f45d1..25a76a279 100644 --- a/src/edit.c +++ b/src/edit.c @@ -2698,6 +2698,7 @@ ins_compl_dictionaries(dict_start, pat, flags, thesaurus) buf = alloc(LSIZE); if (buf == NULL) return; + regmatch.regprog = NULL; /* so that we can goto theend */ /* If 'infercase' is set, don't use 'smartcase' here */ 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 *)"\\"); if (pat_esc == NULL) - return ; + goto theend ; i = (int)STRLEN(pat_esc) + 10; ptr = alloc(i); if (ptr == NULL) { vim_free(pat_esc); - return; + goto theend; } vim_snprintf((char *)ptr, i, "^\\s*\\zs\\V%s", pat_esc); regmatch.regprog = vim_regcomp(ptr, RE_MAGIC); diff --git a/src/version.c b/src/version.c index 42138ca9b..c8c8834f4 100644 --- a/src/version.c +++ b/src/version.c @@ -667,6 +667,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 200, +/**/ 199, /**/ 198, |