Fixed cut&paste bugs and added freespacing for ERT Insets.

[lyx.git] / src / text2.C

diff --git a/src/text2.C b/src/text2.C
index 1440f91c561c231dfe5469c97ac90dd470d44efa..0c092dff9a053ace05a83a13e0f4d6d0990dc799 100644 (file)
--- a/src/text2.C
+++ b/src/text2.C
@@ -391,7 +391,7 @@ void LyXText::removeRow(Row * row) const
                row->next()->previous(row->previous());
        if (!row->previous()) {
                firstrow = row->next();
-               lyx::Assert(firstrow);
+//             lyx::Assert(firstrow);
        } else  {
                row->previous()->next(row->next());
        }
@@ -2376,8 +2376,11 @@ void LyXText::deleteEmptyParagraphMechanism(BufferView * bview,
 
        // We allow all kinds of "mumbo-jumbo" when freespacing.
        if (textclasslist.Style(bview->buffer()->params.textclass,
-                               old_cursor.par()->getLayout()).free_spacing)
+                                                       old_cursor.par()->getLayout()).free_spacing ||
+               old_cursor.par()->isFreeSpacing())
+       {
                return;
+       }
 
        bool deleted = false;