X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferView.cpp;h=023301dd482e596d77e674ac597d9a022288304f;hb=bfe98181169d9e697e515da974d9b6a15a06c940;hp=2bf7d2a4cb6bd421567e788afc714c94b77e3b6b;hpb=6f7505300ed7b4bd1f78bea076b6469e7e9cc32d;p=lyx.git

diff --git a/src/BufferView.cpp b/src/BufferView.cpp
index 2bf7d2a4cb..023301dd48 100644
--- a/src/BufferView.cpp
+++ b/src/BufferView.cpp
@@ -2066,21 +2066,22 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
 		// an arbitrary number to limit number of iterations
 		const int max_iter = 100000;
 		int iterations = 0;
-		Cursor & curs = d->cursor_;
-		Cursor const savecur = curs;
-		curs.reset();
-		if (!curs.nextInset())
-			curs.forwardInset();
-		curs.beginUndoGroup();
-		while(curs && iterations < max_iter) {
-			Inset * const ins = curs.nextInset();
+		Cursor & bvcur = d->cursor_;
+		Cursor const savecur = bvcur;
+		bvcur.reset();
+		if (!bvcur.nextInset())
+			bvcur.forwardInset();
+		bvcur.beginUndoGroup();
+		while(bvcur && iterations < max_iter) {
+			Inset * const ins = bvcur.nextInset();
 			if (!ins)
 				break;
 			docstring insname = ins->layoutName();
 			while (!insname.empty()) {
 				if (insname == name || name == from_utf8("*")) {
-					curs.recordUndo();
 					lyx::dispatch(fr, dr);
+					// we do not want to remember selection here
+					bvcur.clearSelection();
 					++iterations;
 					break;
 				}
@@ -2090,11 +2091,11 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
 				insname = insname.substr(0, i);
 			}
 			// if we did not delete the inset, skip it
-			if (!curs.nextInset() || curs.nextInset() == ins)
-				curs.forwardInset();
+			if (!bvcur.nextInset() || bvcur.nextInset() == ins)
+				bvcur.forwardInset();
 		}
-		curs = savecur;
-		curs.fixIfBroken();
+		bvcur = savecur;
+		bvcur.fixIfBroken();
 		/** This is a dummy undo record only to remember the cursor
 		 * that has just been set; this will be used on a redo action
 		 * (see ticket #10097)
@@ -2102,8 +2103,8 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
 		 * FIXME: a better fix would be to have a way to set the
 		 * cursor value directly, but I am not sure it is worth it.
 		 */
-		curs.recordUndo();
-		curs.endUndoGroup();
+		bvcur.recordUndo();
+		bvcur.endUndoGroup();
 		dr.screenUpdate(Update::Force);
 		dr.forceBufferUpdate();