From: Richard Heck <rgheck@comcast.net>
Date: Mon, 18 Jul 2011 13:53:54 +0000 (+0000)
Subject: Revert r39330.
X-Git-Tag: 2.0.1~92
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=fda8c46cfb9f25a7416919a32b56a9bdd0911a3d;p=features.git

Revert r39330.

This reverts commit 6003924601add454110db97b68974834cad7c4c9.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@39338 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index f3d76b98ef..238225bcb3 100644
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -2568,10 +2568,6 @@ void Buffer::collectChildren(ListOfBuffers & clist, bool grand_children) const
 			// there might be grandchildren
 			child->collectChildren(clist, true);
 	}
-	// Make sure we have not included ourselves.
-	ListOfBuffers::iterator bit = find(clist.begin(), clist.end(), this);
-	if (bit != clist.end())
-		clist.erase(bit);
 }
 
 
diff --git a/status.20x b/status.20x
index 79dbc0bfb7..6bd035f34b 100644
--- a/status.20x
+++ b/status.20x
@@ -158,10 +158,6 @@ What's new
 
 - Fix output of unicode math from within child documents (bug 7682).
 
-- Added a check for recursive includes that should prevent some of the
-  crashes we see in such cases.
-
-
 * USER INTERFACE
 
 - Fixed crash relating to outliner and mouse movement.