Fix for 2516

[Martin Vermeer]

This appears to fix the bug in my limited testing (I couldn't reproduce the bug 
in the
test file, only in the enum example)

- Martin


Index: CutAndPaste.C
===================================================================
--- CutAndPaste.C       (revision 13690)
+++ CutAndPaste.C       (working copy)
@@ -294,7 +294,7 @@
                pars[pit].erase(left, right);
                // Separate handling of para break:
                if (merge && pit != endpit &&
-                  pars[pit].hasSameLayout(pars[pit + 1])) {
+                  (pit + 1 != endpit || pars[pit].hasSameLayout(pars[pit + 
1]))) {
                        pos_type const thissize = pars[pit].size();
                        if (doclear)
                                pars[pit + 1].stripLeadingSpaces();

pgpzogtsOpabX.pgp
Description: PGP signature