[Patch] allow delete para break after insert in CT

[Martin Vermeer]

This is the patch posted on bugzilla (880) to allow backspacing over a
paragraph break inserted under change tracking.

It works, but Jürgen reported a cursor positioning issue, for which I
didn't see any obvious reason or fix.

Can this go into 1.5?

- Martin

Index: text.C
===================================================================
--- text.C      (revision 13339)
+++ text.C      (working copy)
@@ -1681,9 +1681,12 @@
                        // Previous paragraph, mark "carriage return" as
                        // deleted:
                        Paragraph & par = pars_[cur.pit() - 1];
-                       par.setChange(par.size(), Change::DELETED);
-                       setCursorIntern(cur, cur.pit() - 1, par.size());
-                       return false;
+                       // Take care of a just inserted para break:
+                       if (par.lookupChange(par.size()) != Change::INSERTED) {
+                               par.setChange(par.size(), Change::DELETED);
+                               setCursorIntern(cur, cur.pit() - 1, par.size());
+                               return false;
+                       }
                }
 
                needsUpdate = backspacePos0(cur);

pgpFFcq9iiNoR.pgp
Description: PGP signature