For Branch? r36012 - lyx-devel/trunk/src

[Richard Heck]

On 11/03/2010 04:12 PM, rgh...@lyx.org wrote:

Author: rgheck
Date: Wed Nov  3 21:12:18 2010
New Revision: 36012
URL: http://www.lyx.org/trac/changeset/36012

Log:
Fix bug #7014. The problem here is that we get DEFSKIP if we don't
recognize the argument, but that leads to an infinite loop.

This is also in branch. OK to commit?

Richard

Modified:
    lyx-devel/trunk/src/BufferParams.cpp

Modified: lyx-devel/trunk/src/BufferParams.cpp
==============================================================================
--- lyx-devel/trunk/src/BufferParams.cpp        Wed Nov  3 02:29:01 2010        
(r36011)
+++ lyx-devel/trunk/src/BufferParams.cpp        Wed Nov  3 21:12:18 2010        
(r36012)
@@ -645,11 +645,11 @@
                pimpl_->indentation = HSpace(indentation);
        } else if (token == "\\defskip") {
                lex.next();
-               string defskip = lex.getString();
-               if (defskip == "defskip")
-                       // this is invalid
-                       defskip = "medskip";
+               string const defskip = lex.getString();
                pimpl_->defskip = VSpace(defskip);
+               if (pimpl_->defskip.kind() == VSpace::DEFSKIP)
+                       // that is invalid
+                       pimpl_->defskip = VSpace(VSpace::MEDSKIP);
        } else if (token == "\\quotes_language") {
                string quotes_lang;
                lex>>  quotes_lang;