* src/Text.cpp:

- Do not delete special characters in free spacing mode (bug 5125).
	  (this is what we do in trunk already)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_5_X@26222 a592a061-630c-0410-9148-cb99ea01b6c8

src/Text.cpp

@@ -218,21 +218,9 @@ void readParToken(Buffer const & buf, Paragraph & par, Lexer & lex,
 	} else if (token == "\\InsetSpace" || token == "\\SpecialChar") {
 
 		// Insets don't make sense in a free-spacing context! ---Kayvan
-		if (par.isFreeSpacing()) {
-			if (token == "\\InsetSpace")
+		if (par.isFreeSpacing() && token == "\\InsetSpace")
 				par.insertChar(par.size(), ' ', font, change);
-			else if (lex.isOK()) {
-				lex.next();
-				string const next_token = lex.getString();
-				if (next_token == "\\-")
-					par.insertChar(par.size(), '-', font, change);
-				else {
-					lex.printError("Token `$$Token' "
-						       "is in free space "
-						       "paragraph layout!");
-				}
-			}
-		} else {
+		else {
 			auto_ptr<Inset> inset;
 			if (token == "\\SpecialChar" )
 				inset.reset(new InsetSpecialChar);

status.15x

@@ -71,6 +71,8 @@ What's new
 - Produce better quality images on the LyX screen when using recent
   versions of ImageMagick (bug 4749).
 
+- Do not delete special characters in free spacing mode (bug 5125).
+
 
 * USER INTERFACE