X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Foutput_plaintext.cpp;h=b0450bda9f3a731d68b19e8953f183e996cba7b7;hb=447a1056b4f97b102db9666a131ce85001c0676c;hp=8c5655d39b6e315b7ab85743cbb94f67ae9b5ea5;hpb=195f62ac9322285bf4c6e16ec5081cc4c216e066;p=lyx.git

diff --git a/src/output_plaintext.cpp b/src/output_plaintext.cpp
index 8c5655d39b..b0450bda9f 100644
--- a/src/output_plaintext.cpp
+++ b/src/output_plaintext.cpp
@@ -21,6 +21,8 @@
 #include "ParagraphList.h"
 #include "ParagraphParameters.h"
 
+#include "insets/Inset.h"
+
 #include "support/debug.h"
 #include "support/gettext.h"
 #include "support/lstrings.h"
@@ -56,9 +58,11 @@ void writePlaintextFile(Buffer const & buf, odocstream & os,
 	ParagraphList::const_iterator end = par.end();
 	ParagraphList::const_iterator it = beg;
 	for (; it != end; ++it) {
+		bool const merged_par = (*it).parEndChange().deleted();
 		writePlaintextParagraph(buf, *it, os, runparams, ref_printed);
-		os << "\n";
-		if (runparams.linelen > 0)
+		if (!merged_par)
+			os << "\n";
+		if (runparams.linelen > 0 && !merged_par)
 			os << "\n";
 	}
 }