fix reading the author field.

[lyx.git] / src / undo.C

diff --git a/src/undo.C b/src/undo.C
index 3530a8878739319efb89adccc7a5db74ab9813e2..d7a36941d0b6769fd933840b2475f3ce4f988c80 100644 (file)
--- a/src/undo.C
+++ b/src/undo.C
@@ -61,7 +61,7 @@ void recordUndo(Undo::undo_kind kind,
        // create the position information of the Undo entry
        Undo undo;
        undo.kind = kind;
-       undo.cursor = StableDocumentIterator(cur);
+       undo.cursor = StableDocIterator(cur);
        undo.from = first_par;
        undo.end = cur.lastpar() - last_par;
 
@@ -95,7 +95,7 @@ void recordUndo(Undo::undo_kind kind,
                undo.pars = ParagraphList(first, last);
        }
 
-       // push the undo entry to undo stack 
+       // push the undo entry to undo stack
        //lyxerr << "undo record: " << stack.top() << std::endl;
        stack.push(undo);
 
@@ -108,7 +108,8 @@ void performUndoOrRedo(BufferView & bv, Undo const & undo)
 {
        LCursor & cur = bv.cursor();
        lyxerr << "undo, performing: " << undo << std::endl;
-       cur.setCursor(undo.cursor.asDocumentIterator(&bv.buffer()->inset()), false);
+       cur.setCursor(undo.cursor.asDocIterator(&bv.buffer()->inset()));
+       cur.selection() = false;
 
        if (cur.inMathed()) {
                // We stored the full cell here as there is not much to be
@@ -155,8 +156,8 @@ bool textUndoOrRedo(BufferView & bv,
 
        // this implements redo
        otherstack.push(undo);
-       DocumentIterator dit =
-               undo.cursor.asDocumentIterator(&bv.buffer()->inset());
+       DocIterator dit =
+               undo.cursor.asDocIterator(&bv.buffer()->inset());
        if (dit.inMathed()) {
                // Easy way out: store a full cell.
                otherstack.top().array = asString(dit.cell());
@@ -212,9 +213,9 @@ void recordUndo(Undo::undo_kind kind,
        Buffer * buf = cur.bv().buffer();
        recordUndo(kind, cur, first, last, buf->undostack());
        buf->redostack().clear();
-       //lyxerr << "undostack:\n";
-       //for (size_t i = 0, n = buf->undostack().size(); i != n && i < 6; ++i)
-       //      lyxerr << "  " << i << ": " << buf->undostack()[i] << std::endl;
+       lyxerr << "undostack:\n";
+       for (size_t i = 0, n = buf->undostack().size(); i != n && i < 6; ++i)
+               lyxerr << "  " << i << ": " << buf->undostack()[i] << std::endl;
 }
 
 
@@ -224,6 +225,14 @@ void recordUndo(LCursor & cur, Undo::undo_kind kind)
 }
 
 
+void recordUndoInset(LCursor & cur, Undo::undo_kind kind)
+{
+       LCursor c = cur;
+       c.pop();
+       recordUndo(c, kind);
+}
+
+
 void recordUndoSelection(LCursor & cur, Undo::undo_kind kind)
 {
        recordUndo(kind, cur, cur.selBegin().par(), cur.selEnd().par());