X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fcursor.C;h=5d72bfff899f041ceae47652e21bfcecaca1b144;hb=52eb91c94fb70d58dceef430659c8781de2eccda;hp=9a4170578647f9c787511996d0139cedb25ad7c5;hpb=f04eabb1cd468a96aad50bcba814ed029613bb55;p=lyx.git

diff --git a/src/cursor.C b/src/cursor.C
index 9a41705786..5d72bfff89 100644
--- 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"