From af3b63ac4005daa5109c5c149af462e11e9b0af5 Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Tue, 4 Mar 2008 10:14:29 +0000 Subject: [PATCH] * src/CutAndPaste.cpp (eraseSelectionHelper): when the last paragraph that is cut is completely erased, remove it regardless of its layout (fixes bug 3995). git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_5_X@23430 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/CutAndPaste.cpp | 4 +++- status.15x | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/CutAndPaste.cpp b/src/CutAndPaste.cpp index b9b3c31b3f..913479f1ec 100644 --- a/src/CutAndPaste.cpp +++ b/src/CutAndPaste.cpp @@ -310,7 +310,9 @@ PitPosPair eraseSelectionHelper(BufferParams const & params, // Separate handling of paragraph break: if (merge && pit != endpit && - (pit + 1 != endpit || pars[pit].hasSameLayout(pars[endpit]))) { + (pit + 1 != endpit + || pars[pit].hasSameLayout(pars[endpit]) + || pars[endpit].size() == endpos)) { if (pit + 1 == endpit) endpos += pars[pit].size(); mergeParagraph(params, pars, pit); diff --git a/status.15x b/status.15x index fc85be3c8a..3505c8d9a9 100644 --- a/status.15x +++ b/status.15x @@ -38,9 +38,6 @@ What's new * DOCUMENT INPUT/OUTPUT -- Stop warning messages when a local layout file is opened. Fix bugs caused by - incorrect reloading of local layout files. - * BUILD/INSTALLATION: @@ -61,6 +58,8 @@ What's new - Check for PDF->PS, PDF->EPS and PS->EPS converters and use them (bug 3968). +- Stop warning messages when a local layout file is opened. Fix bugs caused by + incorrect reloading of local layout files. * USER INTERFACE: @@ -68,6 +67,7 @@ What's new - Fix parameter input of the math commands \makebox and \framebox (bug 2461). +- When cutting a selection do not leave a dangling paragraph (bug 3995). * DOCUMENTATION