summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2006-10-17 13:16:39 +0000
committerBram Moolenaar <Bram@vim.org>2006-10-17 13:16:39 +0000
commit8b402a0a8700593f05b34c8219bd2c1f6eabb466 (patch)
tree51c18a79858dede1e12587bda15f1a25de176923
parentbc444827c29f52be91d0622be62ce2ca9627f937 (diff)
downloadvim-git-8b402a0a8700593f05b34c8219bd2c1f6eabb466.tar.gz
updated for version 7.0-140v7.0.140
-rw-r--r--src/eval.c12
-rw-r--r--src/version.c2
2 files changed, 11 insertions, 3 deletions
diff --git a/src/eval.c b/src/eval.c
index 2eb4f8804..c77713656 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -5451,6 +5451,8 @@ list_equal(l1, l2, ic)
{
listitem_T *item1, *item2;
+ if (l1 == l2)
+ return TRUE;
if (list_len(l1) != list_len(l2))
return FALSE;
@@ -5487,6 +5489,8 @@ dict_equal(d1, d2, ic)
dictitem_T *item2;
int todo;
+ if (d1 == d2)
+ return TRUE;
if (dict_len(d1) != dict_len(d2))
return FALSE;
@@ -5522,10 +5526,12 @@ tv_equal(tv1, tv2, ic)
static int recursive = 0; /* cach recursive loops */
int r;
- /* Catch lists and dicts that have an endless loop by limiting
- * recursiveness to 1000. */
- if (tv1->v_type != tv2->v_type || recursive >= 1000)
+ if (tv1->v_type != tv2->v_type)
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)
{
diff --git a/src/version.c b/src/version.c
index 52eb65cd7..eae093602 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 */
/**/
+ 140,
+/**/
139,
/**/
138,