X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fdociterator.C;h=4d93aa7a0177228266c36fc14b7445103b7ba74f;hb=2734cc154853c61a7ea54bfeea3adc908f68bdc5;hp=47e7526e5e00d0af03eaa4357c73f84ac0bd3f4d;hpb=6c300f72a217722652dc27db9108e1050028979c;p=lyx.git

diff --git a/src/dociterator.C b/src/dociterator.C
index 47e7526e5e..4d93aa7a01 100644
--- a/src/dociterator.C
+++ b/src/dociterator.C
@@ -414,10 +414,6 @@ void DocIterator::forwardPar()
 {
 	forwardPos();
 
-#if 0
-	DocIterator cmp(*this);
-#endif
-
 	while (!empty() && (!inTexted() || pos() != 0)) {
 		if (inTexted()) {
 			pos_type const lastp = lastpos();
@@ -428,12 +424,6 @@ void DocIterator::forwardPar()
 		}
 		forwardPos();
 	}
-
-#if 0
-	while (!cmp.empty() && (!cmp.inTexted() || cmp.pos() != 0))
-		cmp.forwardPos();
-	BOOST_ASSERT(cmp == *this);
-#endif
 }
 
 
@@ -448,8 +438,19 @@ void DocIterator::forwardChar()
 void DocIterator::forwardInset()
 {
 	forwardPos();
-	while (!empty() && (pos() == lastpos() || nextInset() == 0))
+
+	while (!empty() && !nextInset()) {
+		if (inTexted()) {
+			pos_type const lastp = lastpos();
+			Paragraph const & par = paragraph();
+			pos_type & pos = top().pos();
+			while (pos < lastp && !par.isInset(pos))
+				++pos;
+			if (pos < lastp)
+				break;
+		}
 		forwardPos();
+	}
 }