add config.h

[lyx.git] / src / cursor.C

diff --git a/src/cursor.C b/src/cursor.C
index 6dbd777be726e1f66d56696bc4690fe1c4453ee4..5d72bfff899f041ceae47652e21bfcecaca1b144 100644 (file)
--- a/src/cursor.C
+++ b/src/cursor.C
@@ -543,8 +543,12 @@ void LCursor::info(odocstream & os) const
                operator[](i).inset().infoize(os);
                os << "  ";
        }
-       if (pos() != 0)
-               prevInset()->infoize2(os);
+       if (pos() != 0) {
+               InsetBase const * inset = prevInset();
+               // prevInset() can return 0 in certain case.
+               if (inset)
+                       prevInset()->infoize2(os);
+       }
        // overwite old message
        os << "                    ";
 }
@@ -558,6 +562,7 @@ bool LCursor::selHandle(bool sel)
 
        resetAnchor();
        selection() = sel;
+       cap::saveSelection(*this);
        return true;
 }
 
@@ -597,7 +602,6 @@ std::ostream & operator<<(std::ostream & os, LCursor const & cur)
 #include "mathed/InsetMathScript.h"
 #include "mathed/InsetMathUnknown.h"
 #include "mathed/MathFactory.h"
-#include "mathed/MathMacroArgument.h"
 #include "mathed/MathStream.h"
 #include "mathed/MathSupport.h"
 
@@ -765,7 +769,7 @@ bool LCursor::backspace()
        autocorrect() = false;
 
        if (selection()) {
-               cap::selDel(*this);
+               cap::eraseSelection(*this);
                return true;
        }
 
@@ -817,7 +821,7 @@ bool LCursor::erase()
                return true;
 
        if (selection()) {
-               cap::selDel(*this);
+               cap::eraseSelection(*this);
                return true;
        }