Scons: handle the case when qt4 is in system directories

[lyx.git] / src / text2.C

diff --git a/src/text2.C b/src/text2.C
index 0670e616e69f14f946145a33e6a995ce2350291d..9a9057c39112bad1352a30a498548c37af6350fa 100644 (file)
--- a/src/text2.C
+++ b/src/text2.C
@@ -943,7 +943,7 @@ pit_type LyXText::getPitNearY(BufferView & bv, int y)
                && y >= last->second.y_ + int(pars_[last->first].descent())) {
                pit = last->first + 1;
                //  and we are not at the last paragraph in the inset.
-               if (pit == pars_.size())
+               if (pit == int(pars_.size()))
                        return last->first;
                // then this is the paragraph we are looking for.
                // rebreak it and update the CoordCache.
@@ -1321,6 +1321,8 @@ bool LyXText::deleteEmptyParagraphMechanism(LCursor & cur, LCursor & old)
                    && oldpar.isLineSeparator(old.pos() - 1)
                    && !oldpar.isDeleted(old.pos() - 1)) {
                        oldpar.eraseChar(old.pos() - 1, false); // do not track changes in DEPM
+                       // rebreak it and update the CoordCache.
+                       redoParagraph(cur.bv(), old.pit());
 #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