From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Mon, 18 Feb 2008 10:16:43 +0000 (+0000)
Subject: 	* CutAndPaste.cpp (eraseSelectionHelper): when the last paragraph that
X-Git-Tag: 1.6.10~6233
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=85c0bf5e165b14dfe7a81a815ebc16e27551b684;p=lyx.git

	* 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/trunk@23054 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/CutAndPaste.cpp b/src/CutAndPaste.cpp
index 9347e3c76a..1dfd91e6af 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);