>>>>> "Juergen" == Juergen Spitzmueller <[EMAIL PROTECTED]> writes:

Juergen> Georg Baum wrote:
>> and then redo the changes in CutAndPaset.C by hand. IIRC it was
>> only at 4 places, it took me two minutes to do that.

Juergen> Please note that if you intend the ct patch also, there are
Juergen> some additional changes in text.C (IIRC), which are not
Juergen> needed (and do not apply) without that patch. So if you
Juergen> intend to apply both, it is probably better to apply the ct
Juergen> patch first.

OK, let's apply bug880 first. I took your patch in the bug. Is that
right?

And is the following ChageLog complete?

Index: src/ChangeLog
===================================================================
--- src/ChangeLog       (revision 13479)
+++ src/ChangeLog       (working copy)
@@ -1,3 +1,34 @@
+2006-03-15  Martin Vermeer  <[EMAIL PROTECTED]>
+
+       * CutAndPaste.C (pasteSelectionHelper): comments
+       * paragraph_funcs.C (mergeParagraph): fix Juergen's cut&paste bug
+       * changes.h: comments
+       * paragraph.C (stripLeadingSpaces): remove unnecessary setChange
+       * text.C (backspace): allow deletion of inserted para break
+       Change tracking -related bug fixes (reported by Juergen) and
+       some documentation work
+
+2006-03-13  Martin Vermeer  <[EMAIL PROTECTED]>
+
+       * rowpainter.C (paintChangeBar): fix painting of change bar with
+       only paragraph break changed
+
+2006-03-11  Martin Vermeer  <[EMAIL PROTECTED]>
+
+       * paragraph.[Ch] (write, lookupChange, lookupChangeFull;
+       added setChangeFull):
+       * paragraph_pimpl.[Ch] (trackChanges, cleanChanges, acceptChange,
+       rejectChange, erase; added setChangeFull):
+       * CutAndPaste.C (eraseSelectionHelper):
+       * lyxtext.h:
+       * text.C (readParToken, readParagraph, breakParagraph,
+       acceptChange, rejectChange, backspace, currentState;
+       added backspacePos0):
+       * paragraph_funcs.C (breakParagraphConservative, mergeParagraph):
+       * lyxfind.C (findChange, findNextChange): fix bug 880: Change
+       tracked paragraphs should still allow a paragraph split (and related
+       things, i.e., multi-paragraph change tracking)
+


JMarc

Reply via email to