]> git.lyx.org Git - features.git/commitdiff
Do not auto-insert separator for keepempty layouts
authorJuergen Spitzmueller <spitz@lyx.org>
Sat, 29 Dec 2018 12:35:39 +0000 (13:35 +0100)
committerJuergen Spitzmueller <spitz@lyx.org>
Sat, 29 Dec 2018 17:32:47 +0000 (18:32 +0100)
Candidate for stable

(cherry picked from commit 59d73f52b8afa734c02db08b075c1cdaf25611c1)

src/Text3.cpp
status.23x

index e246705c5e459021752c9009dbad43edf6f5903a..e584d83f47808e2ae04a44396e8075f890088aa2 100644 (file)
@@ -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()
index 090770daa33a45fd839172903296fc6cb7144b5c..a4a74224e5cd8f92ecacc61e356298a30fa5808c 100644 (file)
@@ -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