From a9890828bd4cab4842b294f7ff2e81d019d67282 Mon Sep 17 00:00:00 2001
From: Juergen Spitzmueller <spitz@lyx.org>
Date: Sat, 29 Dec 2018 13:35:39 +0100
Subject: [PATCH] Do not auto-insert separator for keepempty layouts

Candidate for stable

(cherry picked from commit 59d73f52b8afa734c02db08b075c1cdaf25611c1)
---
 src/Text3.cpp | 1 +
 status.23x    | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/src/Text3.cpp b/src/Text3.cpp
index e246705c5e..e584d83f47 100644
--- a/src/Text3.cpp
+++ b/src/Text3.cpp
@@ -1207,6 +1207,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 		pit_type prev = pit > 0 ? depthHook(pit, par.getDepth()) : pit;
 		if (prev < pit && cur.pos() == par.beginOfBody()
 		    && !par.size() && !par.isEnvSeparator(cur.pos())
+		    && !par.layout().keepempty
 		    && !par.layout().isCommand()
 		    && pars_[prev].layout() != par.layout()
 		    && pars_[prev].layout().isEnvironment()
diff --git a/status.23x b/status.23x
index 090770daa3..a4a74224e5 100644
--- a/status.23x
+++ b/status.23x
@@ -69,6 +69,8 @@ What's new
 
 - Fix parsing of math-macro optional arguments after save-reopen (bug 11346).
 
+- Fix problem with wrongly inserted separator.
+
 
 * USER INTERFACE
 
-- 
2.39.5