X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCursor.cpp;h=572e062876d461d8680adb218b857e59c51eddc2;hb=4df7d8ab1ae443119057562fb76c2e438c053eef;hp=4f915d653d76f0a177415de36e181f20a66fdce2;hpb=7580efc7f3df6400cac9969d13509c1168eda51d;p=lyx.git

diff --git a/src/Cursor.cpp b/src/Cursor.cpp
index 4f915d653d..572e062876 100644
--- a/src/Cursor.cpp
+++ b/src/Cursor.cpp
@@ -321,6 +321,15 @@ void Cursor::dispatch(FuncRequest const & cmd0)
 	// object will be used again.
 	if (!disp_.dispatched()) {
 		LYXERR(Debug::DEBUG, "RESTORING OLD CURSOR!");
+		// We might have invalidated the cursor when removing an empty
+		// paragraph while the cursor could not be moved out the inset
+		// while we initially thought we could. This might happen when
+		// a multiline inset becomes an inline inset when the second 
+		// paragraph is removed.
+		if (safe.pit() > safe.lastpit()) {
+			safe.pit() = safe.lastpit();
+			safe.pos() = safe.lastpos();
+		}
 		operator=(safe);
 		disp_.update(Update::None);
 		disp_.dispatched(false);
@@ -426,6 +435,12 @@ void Cursor::resetAnchor()
 }
 
 
+void Cursor::setCursorToAnchor()
+{
+	if (selection())
+		setCursor(anchor_);
+}
+
 
 bool Cursor::posBackward()
 {
@@ -1769,8 +1784,34 @@ bool Cursor::upDownInText(bool up, bool & updateNeeded)
 	else
 		row = pm.pos2row(pos());
 		
-	if (atFirstOrLastRow(up))
+	if (atFirstOrLastRow(up)) {
+		// Is there a place for the cursor to go ? If yes, we
+		// can execute the DEPM, otherwise we should keep the
+		// paragraph to host the cursor.
+		Cursor dummy = *this;
+		bool valid_destination = false;
+		for(; dummy.depth(); dummy.pop())
+			if (!dummy.atFirstOrLastRow(up)) {
+				valid_destination = true;
+				break;
+			}
+
+		// will a next dispatch follow and if there is a new 
+		// dispatch will it move the cursor out ?
+		if (depth() > 1 && valid_destination) {
+			// The cursor hasn't changed yet. This happens when
+			// you e.g. move out of an inset. And to give the 
+			// DEPM the possibility of doing something we must
+			// provide it with two different cursors. (Lgb, vfr)
+			dummy = *this;
+			dummy.pos() = dummy.pos() == 0 ? dummy.lastpos() : 0;
+			dummy.pit() = dummy.pit() == 0 ? dummy.lastpit() : 0;
+
+			updateNeeded |= bv().checkDepm(dummy, *this);
+			updateTextTargetOffset();
+		}
 		return false;
+	}
 
 	// with and without selection are handled differently
 	if (!selection()) {
@@ -1783,16 +1824,16 @@ bool Cursor::upDownInText(bool up, bool & updateNeeded)
 			tm.editXY(*this, xo, yo + textRow().descent() + 1);
 		clearSelection();
 		
-		// This happens when you move out of an inset.
-		// And to give the DEPM the possibility of doing
-		// something we must provide it with two different
-		// cursors. (Lgb)
+		// This happens when you move out of an inset.  
+		// And to give the DEPM the possibility of doing  
+		// something we must provide it with two different  
+		// cursors. (Lgb)  
 		Cursor dummy = *this;
 		if (dummy == old)
 			++dummy.pos();
 		if (bv().checkDepm(dummy, old)) {
 			updateNeeded = true;
-			// Make sure that cur gets back whatever happened to dummy(Lgb)
+			// Make sure that cur gets back whatever happened to dummy(Lgb) 
 			operator=(dummy);
 		}
 	} else {
@@ -2047,7 +2088,7 @@ bool notifyCursorLeavesOrEnters(Cursor const & old, Cursor & cur)
 	    && !cur.buffer()->isClean()
 	    && cur.inTexted() && old.inTexted()
 	    && cur.pit() != old.pit()) {
-		old.paragraph().updateWords(old.top());
+		old.paragraph().updateWords();
 	}
 
 	// notify everything on top of the common part in old cursor,