fix two crashes related to dEPM. Some crashes remain

[lyx.git] / src / text3.C

diff --git a/src/text3.C b/src/text3.C
index 2a7b879f3f9ab943abcbde5843addee96d37514d..5f3323a0cd1bde047fb0003de8e1d11b9596b99c 100644 (file)
--- a/src/text3.C
+++ b/src/text3.C
@@ -136,17 +136,20 @@ namespace {
 
                if (sel.empty()) {
                        const int old_pos = cur.pos();
-                       cur.insert(new MathHullInset);
+                       cur.insert(new MathHullInset("simple"));
                        BOOST_ASSERT(old_pos == cur.pos());
                        cur.nextInset()->edit(cur, true);
-                       cur.dispatch(FuncRequest(LFUN_MATH_MUTATE, "simple"));
                        // don't do that also for LFUN_MATH_MODE
                        // unless you want end up with always changing
                        // to mathrm when opening an inlined inset --
                        // I really hate "LyXfunc overloading"...
                        if (display)
                                cur.dispatch(FuncRequest(LFUN_MATH_DISPLAY));
-                       cur.dispatch(FuncRequest(LFUN_INSERT_MATH, cmd.argument));
+                       // Avoid an unnecessary undo step if cmd.argument
+                       // is empty
+                       if (!cmd.argument.empty())
+                               cur.dispatch(FuncRequest(LFUN_INSERT_MATH,
+                                                        cmd.argument));
                } else {
                        // create a macro if we see "\\newcommand"
                        // somewhere, and an ordinary formula
@@ -155,9 +158,8 @@ namespace {
                        if (sel.find("\\newcommand") == string::npos
                            && sel.find("\\def") == string::npos)
                        {
-                               cur.insert(new MathHullInset);
+                               cur.insert(new MathHullInset("simple"));
                                cur.dispatch(FuncRequest(LFUN_RIGHT));
-                               cur.dispatch(FuncRequest(LFUN_MATH_MUTATE, "simple"));
                                cur.dispatch(FuncRequest(LFUN_INSERT_MATH, sel));
                        } else {
                                istringstream is(sel);
@@ -190,8 +192,10 @@ bool LyXText::cursorPrevious(LCursor & cur)
 
        int x = cur.x_target();
 
-       setCursorFromCoordinates(cur, x, 0);
-       bool updated = cursorUp(cur);
+       bool updated = setCursorFromCoordinates(cur, x, 0);
+       if (updated)
+               cur.bv().update();
+       updated |= cursorUp(cur);
 
        if (cpar == cur.pit() && cpos == cur.pos()) {
                // we have a row which is taller than the workarea. The
@@ -211,8 +215,10 @@ bool LyXText::cursorNext(LCursor & cur)
        lyx::pit_type cpar = cur.pit();
 
        int x = cur.x_target();
-       setCursorFromCoordinates(cur, x, cur.bv().workHeight() - 1);
-       bool updated = cursorDown(cur);
+       bool updated = setCursorFromCoordinates(cur, x, cur.bv().workHeight() - 1);
+       if (updated)
+               cur.bv().update();
+       updated |= cursorDown(cur);
 
        if (cpar == cur.pit() && cpos == cur.pos()) {
                // we have a row which is taller than the workarea. The
@@ -958,12 +964,10 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
                                cur.insert(new InsetQuotes(c,
                                    bufparams.quotes_language,
                                    InsetQuotes::SingleQ));
-                       else if (arg == "double")
+                       else
                                cur.insert(new InsetQuotes(c,
                                    bufparams.quotes_language,
                                    InsetQuotes::DoubleQ));
-                       else
-                               cur.insert(new InsetQuotes(c, bufparams));
                        cur.posRight();
                }
                else
@@ -1271,9 +1275,8 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
        case LFUN_INSERT_MATH:
        case LFUN_INSERT_MATRIX:
        case LFUN_MATH_DELIM: {
-               cur.insert(new MathHullInset);
+               cur.insert(new MathHullInset("simple"));
                cur.dispatch(FuncRequest(LFUN_RIGHT));
-               cur.dispatch(FuncRequest(LFUN_MATH_MUTATE, "simple"));
                cur.dispatch(cmd);
                break;
        }