* Painter.h:

[lyx.git] / src / text2.C

diff --git a/src/text2.C b/src/text2.C
index afc507d4707648bf2771123765a6b442a77c8b1f..96023861b0aec75c8615436777bb42faa2612075 100644 (file)
--- a/src/text2.C
+++ b/src/text2.C
@@ -959,6 +959,7 @@ Row const & LyXText::getRowNearY(int y, pit_type pit) const
 InsetBase * LyXText::editXY(LCursor & cur, int x, int y)
 {
        if (lyxerr.debugging(Debug::WORKAREA)) {
+               lyxerr << "LyXText::editXY(cur, " << x << ", " << y << ")" << std::endl;
                bv()->coordCache().dump();
        }
        pit_type pit = getPitNearY(y);
@@ -1260,8 +1261,8 @@ bool LyXText::deleteEmptyParagraphMechanism(LCursor & cur, LCursor & old)
                    && old.pos() < oldpar.size()
                    && oldpar.isLineSeparator(old.pos())
                    && oldpar.isLineSeparator(old.pos() - 1)
-                   && oldpar.lookupChange(old.pos() - 1).type != Change::DELETED) {
-                       oldpar.erase(old.pos() - 1, false); // do not track changes in DEPM
+                   && !oldpar.isDeleted(old.pos() - 1)) {
+                       oldpar.eraseChar(old.pos() - 1, false); // do not track changes in DEPM
 #ifdef WITH_WARNINGS
 #warning This will not work anymore when we have multiple views of the same buffer
 // In this case, we will have to correct also the cursors held by