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

diff --git a/src/Cursor.cpp b/src/Cursor.cpp
index 4552983b556dcae30fd7a5b7ed5d4976ca304b63..416e666047cba1d3e108c0bfded27c0c559aee05 100644 (file)
--- 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 6146307eba5f96f8a5a3e4b540e89571a15c88cc..6b29809261a4d5be798c4bf31a1e39e065d9a9b6 100644 (file)
--- 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();