revert last accidental commit and do the intended one

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

diff --git a/src/mathed/math_gridinset.C b/src/mathed/math_gridinset.C
index cceff1df069212619bd4d4d5547cbf172ca83014..f729eca81b7912cc634bf28324b05ec5de4cf76b 100644 (file)
--- a/src/mathed/math_gridinset.C
+++ b/src/mathed/math_gridinset.C
@@ -1134,7 +1134,7 @@ void MathGridInset::doDispatch(LCursor & cur, FuncRequest & cmd)
                else if (s == "delete-row") {
                        for (int i = 0, n = extractInt(is); i < n; ++i) {
                                delRow(cur.row());
-                               if (cur.idx() > nargs())
+                               if (cur.idx() >= nargs())
                                        cur.idx() -= ncols();
                        }
                        cur.pos() = 0; // trick, see below

diff --git a/src/mathed/math_scriptinset.C b/src/mathed/math_scriptinset.C
index 3c1797143cabec7f51cbd54a09a1b38613f0d51f..573072c28d07ab2a7f32cf3f542c1ea6fc980cc4 100644 (file)
--- a/src/mathed/math_scriptinset.C
+++ b/src/mathed/math_scriptinset.C
@@ -292,14 +292,10 @@ bool MathScriptInset::hasLimits() const
        if (!nuc().back()->isScriptable())
                return false;
 
-       if (nuc().back()->asSymbolInset()) {
-               // \intop is an alias for \int\limits, \ointop == \oint\limits
-               if (nuc().back()->asSymbolInset()->name().find("intop") != string::npos)
-                       return true;
-               // per default \int has limits beside the \int even in displayed formulas
+       // per default \int has limits beside the \int even in displayed formulas
+       if (nuc().back()->asSymbolInset())
                if (nuc().back()->asSymbolInset()->name().find("int") != string::npos)
                        return false;
-       }
 
        // assume "real" limits for everything else
        return true;