Backed out a change of my last patch which I now see is not correct. This

should fix the undo bugs we see.

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

diff --git a/src/ChangeLog b/src/ChangeLog
index 7c1a246df8463c3f31023108484a1cd8eb0ba847..460fea54ca53753bef6d36069a261ccecca8650f 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2002-11-08  Juergen Vigna  <jug@sad.it>
+
+       * undo_funcs.C (textHandleUndo): fixed problems with undo introduced
+       by my last patch (hopefully).
+
 2002-11-08  John Levon  <levon@movementarian.org>
 
        * iterators.h:

diff --git a/src/undo_funcs.C b/src/undo_funcs.C
index 2d8e529b2984f91bb037c4171b11ec75687287e3..873f445a5b15453bbb10628f5973ac8662661985 100644 (file)
--- a/src/undo_funcs.C
+++ b/src/undo_funcs.C
@@ -193,13 +193,18 @@ bool textHandleUndo(BufferView * bv, Undo & undo)
                        it->getLyXText(bv)->setCursorIntern(bv, before, 0);
                else
                        bv->text->setCursorIntern(bv, before, 0);
-       } else { // otherwise this is the first one and we start here
+       }
+// we are not ready for this we cannot set the cursor for a paragraph
+// which is not already in a row of LyXText!!!
+#if 0
+       else { // otherwise this is the first one and we start here
                Inset * it = undopar->inInset();
                if (it)
                        it->getLyXText(bv)->setCursorIntern(bv, undopar, 0);
                else
                        bv->text->setCursorIntern(bv, undopar, 0);
        }
+#endif
 
        Paragraph * endpar = 0;
        // calculate the endpar for redoing the paragraphs.