Fix some of the InsetSpace problems.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25014 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/insets/InsetSpace.cpp b/src/insets/InsetSpace.cpp
index 86e690a77744b4433b2e97cd60016c304273d6df..c8b2c9c95975b9c2b440cd117ff32fae6a7dcd92 100644 (file)
--- a/src/insets/InsetSpace.cpp
+++ b/src/insets/InsetSpace.cpp
@@ -441,7 +441,6 @@ void InsetSpaceParams::read(Lexer & lex)
 
        if (lex.checkFor("\\length"))
                lex >> length;
-       lex >> "\\end_inset";
 }
 
 
@@ -455,6 +454,7 @@ void InsetSpace::write(ostream & os) const
 void InsetSpace::read(Lexer & lex)
 {
        params_.read(lex);
+       lex >> "\\end_inset";
 }
 
 
@@ -632,7 +632,11 @@ void InsetSpace::string2params(string const & in, InsetSpaceParams & params)
        lex.setContext("InsetSpace::string2params");
        lex >> "space";
 
-       params.read(lex);
+       // There are cases, such as when we are called via getStatus() from
+       // Dialog::canApply(), where we are just called with "space" rather
+       // than a full "space \type{}\n\\end_inset".
+       if (lex.isOK())
+               params.read(lex);
 }