Fix deleting of paragraphs after undo (fix #236).

[lyx.git] / src / text2.C

diff --git a/src/text2.C b/src/text2.C
index caed3ece552024c44af8e106d81da8d93c330068..ce3c27d570d3bc099775f48c1a1c24ecf527413b 100644 (file)
--- a/src/text2.C
+++ b/src/text2.C
@@ -2048,15 +2048,26 @@ bool LyXText::setCursor(BufferView * bview, Paragraph * par,
 
 
 void LyXText::setCursor(BufferView * bview, LyXCursor & cur, Paragraph * par,
-                       pos_type pos, bool boundary) const
+                        pos_type pos, bool boundary) const
 {
        lyx::Assert(par);
        lyx::Assert(bview);
-       
+
        cur.par(par);
        cur.pos(pos);
        cur.boundary(boundary);
 
+#if 0
+       if (pos && par->getChar(pos) == Paragraph::META_INSET &&
+               par->getInset(pos)) {
+               Inset * ins = par->getInset(pos);
+               if (ins->needFullRow() || ins->display()) {
+                       --pos;
+                       boundary = true;
+               }
+       }
+#endif
+
        // get the cursor y position in text
        int y = 0;
        Row * row = getRow(par, pos, y);
@@ -2085,12 +2096,12 @@ void LyXText::setCursor(BufferView * bview, LyXCursor & cur, Paragraph * par,
        }
        
        if (last < row->pos())
-                cursor_vpos = row->pos();
+               cursor_vpos = row->pos();
        else if (pos > last && !boundary)
                cursor_vpos = (row->par()->isRightToLeftPar(bview->buffer()->params))
                        ? row->pos() : last + 1; 
        else if (pos > row->pos() &&
-                (pos > last || boundary))
+                (pos > last || boundary))
                /// Place cursor after char at (logical) position pos - 1
                cursor_vpos = (bidi_level(pos - 1) % 2 == 0)
                        ? log2vis(pos - 1) + 1 : log2vis(pos - 1);
@@ -2106,8 +2117,7 @@ void LyXText::setCursor(BufferView * bview, LyXCursor & cur, Paragraph * par,
             !row->par()->isLineSeparator(main_body-1)))
                main_body = 0;
        
-       for (pos_type vpos = row->pos();
-            vpos < cursor_vpos; ++vpos) {
+       for (pos_type vpos = row->pos(); vpos < cursor_vpos; ++vpos) {
                pos = vis2log(vpos);
                if (main_body > 0 && pos == main_body - 1) {
                        x += fill_label_hfill +
@@ -2326,7 +2336,8 @@ bool LyXText::deleteEmptyParagraphMechanism(BufferView * bview,
                                            LyXCursor const & old_cursor) const
 {
        // Would be wrong to delete anything if we have a selection.
-       if (selection.set()) return false;
+       if (selection.set())
+               return false;
 
        // We allow all kinds of "mumbo-jumbo" when freespacing.
        if (textclasslist[bview->buffer()->params.textclass][