• R/O
  • SSH

vim: 提交

Mirror of the Vim source from https://github.com/vim/vim


Commit MetaInfo

修訂a112fdce9ebd6d538c70602550e94f29a2fc60fc (tree)
時間2007-02-20 11:49:19
作者vimboss
Commitervimboss

Log Message

updated for version 7.0-200

Change Summary

差異

diff -r ec7a570696ac -r a112fdce9ebd src/diff.c
--- a/src/diff.c Tue Feb 20 02:31:20 2007 +0000
+++ b/src/diff.c Tue Feb 20 02:49:19 2007 +0000
@@ -1822,14 +1822,20 @@
18221822
18231823 idx = diff_buf_idx(wp->w_buffer);
18241824 if (idx == DB_COUNT) /* cannot happen */
1825+ {
1826+ vim_free(line_org);
18251827 return FALSE;
1828+ }
18261829
18271830 /* search for a change that includes "lnum" in the list of diffblocks. */
18281831 for (dp = curtab->tp_first_diff; dp != NULL; dp = dp->df_next)
18291832 if (lnum <= dp->df_lnum[idx] + dp->df_count[idx])
18301833 break;
18311834 if (dp == NULL || diff_check_sanity(curtab, dp) == FAIL)
1835+ {
1836+ vim_free(line_org);
18321837 return FALSE;
1838+ }
18331839
18341840 off = lnum - dp->df_lnum[idx];
18351841
diff -r ec7a570696ac -r a112fdce9ebd src/edit.c
--- a/src/edit.c Tue Feb 20 02:31:20 2007 +0000
+++ b/src/edit.c Tue Feb 20 02:49:19 2007 +0000
@@ -2698,6 +2698,7 @@
26982698 buf = alloc(LSIZE);
26992699 if (buf == NULL)
27002700 return;
2701+ regmatch.regprog = NULL; /* so that we can goto theend */
27012702
27022703 /* If 'infercase' is set, don't use 'smartcase' here */
27032704 save_p_scs = p_scs;
@@ -2712,13 +2713,13 @@
27122713 char_u *pat_esc = vim_strsave_escaped(pat, (char_u *)"\\");
27132714
27142715 if (pat_esc == NULL)
2715- return ;
2716+ goto theend ;
27162717 i = (int)STRLEN(pat_esc) + 10;
27172718 ptr = alloc(i);
27182719 if (ptr == NULL)
27192720 {
27202721 vim_free(pat_esc);
2721- return;
2722+ goto theend;
27222723 }
27232724 vim_snprintf((char *)ptr, i, "^\\s*\\zs\\V%s", pat_esc);
27242725 regmatch.regprog = vim_regcomp(ptr, RE_MAGIC);
diff -r ec7a570696ac -r a112fdce9ebd src/version.c
--- a/src/version.c Tue Feb 20 02:31:20 2007 +0000
+++ b/src/version.c Tue Feb 20 02:49:19 2007 +0000
@@ -667,6 +667,8 @@
667667 static int included_patches[] =
668668 { /* Add new patch number below this line */
669669 /**/
670+ 200,
671+/**/
670672 199,
671673 /**/
672674 198,
Show on old repository browser