From b8513d13e56062fdcd651ef04f356c2d2fc71b2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Spitzm=C3=BCller?= <spitz@lyx.org>
Date: Tue, 18 Dec 2007 07:10:55 +0000
Subject: [PATCH] Fix bug 2913: "mark-on" broken.

* src/Cursor.cpp (selHandle):
	- handle mark()
* src/Text.cpp (dissolveInset):
	- switch mark off before using selHandle, just in case.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22204 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/Cursor.cpp | 2 ++
 src/Text.cpp   | 1 +
 2 files changed, 3 insertions(+)

diff --git a/src/Cursor.cpp b/src/Cursor.cpp
index 4552983b55..416e666047 100644
--- a/src/Cursor.cpp
+++ b/src/Cursor.cpp
@@ -577,6 +577,8 @@ void Cursor::info(odocstream & os) const
 bool Cursor::selHandle(bool sel)
 {
 	//lyxerr << "Cursor::selHandle" << endl;
+	if (mark())
+		sel = true;
 	if (sel == selection())
 		return false;
 
diff --git a/src/Text.cpp b/src/Text.cpp
index 6146307eba..6b29809261 100644
--- a/src/Text.cpp
+++ b/src/Text.cpp
@@ -1038,6 +1038,7 @@ bool Text::dissolveInset(Cursor & cur) {
 		return false;
 
 	cur.recordUndoInset();
+	cur.mark() = false;
 	cur.selHandle(false);
 	// save position
 	pos_type spos = cur.pos();