From c44dc071a5658380a1d6bdfcb6f138b70c17d2a5 Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Wed, 30 Jan 2019 23:50:53 +0100 Subject: [PATCH] Fix DEPM at end of paragraph Remove special handling of spaces at end of paragraph. Now they are handled like interword spaces by both DEPM methods. Fix off-by-one error in loop when testing for end of paragraph. Part of bug #11412. (adapted from commit c00234503f9e07795723222e6095c022e45ad1dd) --- src/Text2.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Text2.cpp b/src/Text2.cpp index bcd38f447c..34fe1caecb 100644 --- a/src/Text2.cpp +++ b/src/Text2.cpp @@ -860,13 +860,13 @@ bool Text::deleteEmptyParagraphMechanism(Cursor & cur, && !oldpar.isDeleted(from - 1)) --from; int to = old.pos(); - while (to < oldpar.size() - 1 + while (to < oldpar.size() && oldpar.isLineSeparator(to) && !oldpar.isDeleted(to)) ++to; - // If we are not at the extremity of the paragraph, keep one space - if (from != to && from > 0 && to < oldpar.size()) + // If we are not at the start of the paragraph, keep one space + if (from != to && from > 0) ++from; if (same_par && cur.pos() >= from && cur.pos() < to) -- 2.39.5