0
0
mirror of https://github.com/vim/vim.git synced 2025-09-27 04:14:06 -04:00

updated for version 7.0-140

This commit is contained in:
Bram Moolenaar
2006-10-17 13:16:39 +00:00
parent bc444827c2
commit 8b402a0a87
2 changed files with 11 additions and 3 deletions

View File

@@ -5451,6 +5451,8 @@ list_equal(l1, l2, ic)
{ {
listitem_T *item1, *item2; listitem_T *item1, *item2;
if (l1 == l2)
return TRUE;
if (list_len(l1) != list_len(l2)) if (list_len(l1) != list_len(l2))
return FALSE; return FALSE;
@@ -5487,6 +5489,8 @@ dict_equal(d1, d2, ic)
dictitem_T *item2; dictitem_T *item2;
int todo; int todo;
if (d1 == d2)
return TRUE;
if (dict_len(d1) != dict_len(d2)) if (dict_len(d1) != dict_len(d2))
return FALSE; return FALSE;
@@ -5522,10 +5526,12 @@ tv_equal(tv1, tv2, ic)
static int recursive = 0; /* cach recursive loops */ static int recursive = 0; /* cach recursive loops */
int r; int r;
/* Catch lists and dicts that have an endless loop by limiting if (tv1->v_type != tv2->v_type)
* recursiveness to 1000. */
if (tv1->v_type != tv2->v_type || recursive >= 1000)
return FALSE; return FALSE;
/* Catch lists and dicts that have an endless loop by limiting
* recursiveness to 1000. We guess they are equal then. */
if (recursive >= 1000)
return TRUE;
switch (tv1->v_type) switch (tv1->v_type)
{ {

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 */
/**/
140,
/**/ /**/
139, 139,
/**/ /**/